diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/text/package.json b/packages/text/package.json index b0522ac..5be1a1c 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text.js", "module": "lib/text.es.js", + "bundle": "dist/text.js", "description": "Text via the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/text/package.json b/packages/text/package.json index b0522ac..5be1a1c 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text.js", "module": "lib/text.es.js", + "bundle": "dist/text.js", "description": "Text via the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/ticker/package.json b/packages/ticker/package.json index 970841c..dc54d86 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/ticker.js", "module": "lib/ticker.es.js", + "bundle": "dist/ticker.js", "description": "Tickers are control the timings within PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/settings": "^5.0.0-rc.2" diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/text/package.json b/packages/text/package.json index b0522ac..5be1a1c 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text.js", "module": "lib/text.es.js", + "bundle": "dist/text.js", "description": "Text via the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/ticker/package.json b/packages/ticker/package.json index 970841c..dc54d86 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/ticker.js", "module": "lib/ticker.es.js", + "bundle": "dist/ticker.js", "description": "Tickers are control the timings within PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/settings": "^5.0.0-rc.2" diff --git a/packages/unsafe-eval/package.json b/packages/unsafe-eval/package.json index 3ad7234..600c274 100644 --- a/packages/unsafe-eval/package.json +++ b/packages/unsafe-eval/package.json @@ -5,9 +5,7 @@ "module": "lib/unsafe-eval.es.js", "bundle": "dist/unsafe-eval.js", "bundleInput": "src/bundle.js", - "bundleOutput": { - "format": "umd" - }, + "standalone": true, "description": "Adds support for environments that disallow support of new Function", "author": "Matt Karl ", "homepage": "http://pixijs.com/", @@ -23,11 +21,5 @@ "files": [ "lib/", "dist/" - ], - "scripts": { - "build:min": "terser dist/unsafe-eval.js -c -m -o dist/unsafe-eval.min.js --source-map \"content='dist/unsafe-eval.js.map',includeSources=true,filename='dist/unsafe-eval.min.js.map',url='unsafe-eval.min.js.map'\" --comments \"/^!/\"" - }, - "devDependencies": { - "terser": "^3.14.1" - } + ] } diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/text/package.json b/packages/text/package.json index b0522ac..5be1a1c 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text.js", "module": "lib/text.es.js", + "bundle": "dist/text.js", "description": "Text via the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/ticker/package.json b/packages/ticker/package.json index 970841c..dc54d86 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/ticker.js", "module": "lib/ticker.es.js", + "bundle": "dist/ticker.js", "description": "Tickers are control the timings within PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/settings": "^5.0.0-rc.2" diff --git a/packages/unsafe-eval/package.json b/packages/unsafe-eval/package.json index 3ad7234..600c274 100644 --- a/packages/unsafe-eval/package.json +++ b/packages/unsafe-eval/package.json @@ -5,9 +5,7 @@ "module": "lib/unsafe-eval.es.js", "bundle": "dist/unsafe-eval.js", "bundleInput": "src/bundle.js", - "bundleOutput": { - "format": "umd" - }, + "standalone": true, "description": "Adds support for environments that disallow support of new Function", "author": "Matt Karl ", "homepage": "http://pixijs.com/", @@ -23,11 +21,5 @@ "files": [ "lib/", "dist/" - ], - "scripts": { - "build:min": "terser dist/unsafe-eval.js -c -m -o dist/unsafe-eval.min.js --source-map \"content='dist/unsafe-eval.js.map',includeSources=true,filename='dist/unsafe-eval.min.js.map',url='unsafe-eval.min.js.map'\" --comments \"/^!/\"" - }, - "devDependencies": { - "terser": "^3.14.1" - } + ] } diff --git a/packages/utils/package.json b/packages/utils/package.json index 8ed639b..db8429b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/utils.js", "module": "lib/utils.es.js", + "bundle": "dist/utils.js", + "namespace": "PIXI.utils", "description": "Collection of utilities used by PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,14 +24,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "earcut": "^2.1.3", "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1", "url": "^0.11.0" }, "devDependencies": { diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/text/package.json b/packages/text/package.json index b0522ac..5be1a1c 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text.js", "module": "lib/text.es.js", + "bundle": "dist/text.js", "description": "Text via the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/ticker/package.json b/packages/ticker/package.json index 970841c..dc54d86 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/ticker.js", "module": "lib/ticker.es.js", + "bundle": "dist/ticker.js", "description": "Tickers are control the timings within PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/settings": "^5.0.0-rc.2" diff --git a/packages/unsafe-eval/package.json b/packages/unsafe-eval/package.json index 3ad7234..600c274 100644 --- a/packages/unsafe-eval/package.json +++ b/packages/unsafe-eval/package.json @@ -5,9 +5,7 @@ "module": "lib/unsafe-eval.es.js", "bundle": "dist/unsafe-eval.js", "bundleInput": "src/bundle.js", - "bundleOutput": { - "format": "umd" - }, + "standalone": true, "description": "Adds support for environments that disallow support of new Function", "author": "Matt Karl ", "homepage": "http://pixijs.com/", @@ -23,11 +21,5 @@ "files": [ "lib/", "dist/" - ], - "scripts": { - "build:min": "terser dist/unsafe-eval.js -c -m -o dist/unsafe-eval.min.js --source-map \"content='dist/unsafe-eval.js.map',includeSources=true,filename='dist/unsafe-eval.min.js.map',url='unsafe-eval.min.js.map'\" --comments \"/^!/\"" - }, - "devDependencies": { - "terser": "^3.14.1" - } + ] } diff --git a/packages/utils/package.json b/packages/utils/package.json index 8ed639b..db8429b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/utils.js", "module": "lib/utils.es.js", + "bundle": "dist/utils.js", + "namespace": "PIXI.utils", "description": "Collection of utilities used by PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,14 +24,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "earcut": "^2.1.3", "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1", "url": "^0.11.0" }, "devDependencies": { diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index a1cab20..a9db2d0 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -18,16 +18,35 @@ */ /** - * A simple JS library that detects mobile devices + * A simple JS library that detects mobile devices. * * @see {@link https://github.com/kaimallea/isMobile} * * @memberof PIXI.utils - * @function isMobile + * @name isMobile * @type {Object} + * @property {boolean} any - `true` if current platform is tablet or phone device + * @property {boolean} tablet - `true` if current platform large-screen tablet device + * @property {boolean} phone - `true` if current platform small-screen phone device + * @property {object} apple + * @property {boolean} apple.device - `true` if any Apple device + * @property {boolean} apple.tablet - `true` if any Apple iPad + * @property {boolean} apple.phone - `true` if any Apple iPhone + * @property {boolean} apple.ipod - `true` if any iPod + * @property {object} android + * @property {boolean} android.device - `true` if any Android device + * @property {boolean} android.tablet - `true` if any Android tablet + * @property {boolean} android.phone - `true` if any Android phone + * @property {object} amazon + * @property {boolean} amazon.device - `true` if any Silk device + * @property {boolean} amazon.tablet - `true` if any Silk tablet + * @property {boolean} amazon.phone - `true` if any Silk phone + * @property {object} windows + * @property {boolean} windows.device - `true` if any Windows device + * @property {boolean} windows.tablet - `true` if any Windows tablet + * @property {boolean} windows.phone - `true` if any Windows phone */ -import isMobile from 'ismobilejs'; -export { isMobile }; +export { isMobile } from '@pixi/settings'; /** * A high performance event emitter @@ -38,8 +57,7 @@ * @class EventEmitter * @type {EventEmitter} */ -import EventEmitter from 'eventemitter3'; -export { EventEmitter }; +export { default as EventEmitter } from 'eventemitter3'; /** * A polygon triangulation library @@ -53,8 +71,18 @@ * @param {number} [dimensions=2] The number of coordinates per vertex in the input array * @return {number[]} Triangulated polygon */ -import earcut from 'earcut'; -export { earcut }; +export { default as earcut } from 'earcut'; + +/** + * Node.js compatible URL utilities. + * + * @see https://www.npmjs.com/package/url + * + * @memberof PIXI.utils + * @name url + * @type {object} + */ +export { default as url } from 'url'; import './settings'; diff --git a/bundles/pixi.js-legacy/package.json b/bundles/pixi.js-legacy/package.json index 1051b18..ba422e7 100644 --- a/bundles/pixi.js-legacy/package.json +++ b/bundles/pixi.js-legacy/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi-legacy.js", "module": "lib/pixi-legacy.es.js", "bundle": "dist/pixi-legacy.js", @@ -25,8 +26,7 @@ "url": "https://github.com/pixijs/pixi.js.git" }, "scripts": { - "test": "floss --path test", - "build:min": "terser dist/pixi-legacy.js -c -m -o dist/pixi-legacy.min.js --source-map \"content='dist/pixi-legacy.js.map',includeSources=true,filename='dist/pixi-legacy.min.js.map',url='pixi-legacy.min.js.map'\" --comments \"/pixi.js-legacy - /\"" + "test": "floss --path test" }, "files": [ "lib/", @@ -46,7 +46,6 @@ "pixi.js": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/bundles/pixi.js/package.json b/bundles/pixi.js/package.json index a1e8f47..a4653ab 100644 --- a/bundles/pixi.js/package.json +++ b/bundles/pixi.js/package.json @@ -9,6 +9,7 @@ "Chad Engler ", "Richard Davey " ], + "standalone": true, "main": "lib/pixi.js", "module": "lib/pixi.es.js", "bundle": "dist/pixi.js", @@ -26,8 +27,7 @@ }, "scripts": { "test": "floss --path test", - "postinstall": "node scripts/support-pixi.js", - "build:min": "terser dist/pixi.js -c -m -o dist/pixi.min.js --source-map \"content='dist/pixi.js.map',includeSources=true,filename='dist/pixi.min.js.map',url='pixi.min.js.map'\" --comments \"/pixi.js - /\"" + "postinstall": "node scripts/support-pixi.js" }, "files": [ "lib/", @@ -72,7 +72,6 @@ "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { - "floss": "^2.1.5", - "terser": "^3.14.1" + "floss": "^2.1.5" } } diff --git a/package-lock.json b/package-lock.json index 8ada7c1..0ebb1af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2879,6 +2879,31 @@ } } }, + "cross-env": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.0.tgz", + "integrity": "sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5", + "is-windows": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -5729,6 +5754,28 @@ } } }, + "jest-worker": { + "version": "24.4.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.4.0.tgz", + "integrity": "sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^1.0.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6437,6 +6484,47 @@ "trim-newlines": "^1.0.0" } }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, "merge2": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.3.tgz", @@ -8515,6 +8603,18 @@ } } }, + "rollup-plugin-terser": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz", + "integrity": "sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "jest-worker": "^24.0.0", + "serialize-javascript": "^1.6.1", + "terser": "^3.14.1" + } + }, "rollup-pluginutils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz", @@ -8585,6 +8685,12 @@ "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true }, + "serialize-javascript": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz", + "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==", + "dev": true + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -8894,6 +9000,24 @@ "urix": "^0.1.0" } }, + "source-map-support": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz", + "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "source-map-url": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", @@ -9263,6 +9387,25 @@ } } }, + "terser": { + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", + "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", + "dev": true, + "requires": { + "commander": "^2.19.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.10" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, "text-encoding": { "version": "0.6.4", "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz", diff --git a/package.json b/package.json index 6d81947..d9371c7 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,17 @@ "lint": "eslint *.js test bundles packages tools --ignore-path .gitignore --max-warnings 0", "lintfix": "npm run lint -- --fix", "prebuild": "npm run clean:build", - "build:min": "lerna run build:min --concurrency 1", - "build": "rollup -c", + "build": "npm run build:dev", + "build:prod": "cross-env NODE_ENV=production rollup -c", + "build:dev": "rollup -c", "postbuild": "npm run types", "watch": "rollup -cw", "lerna": "lerna", - "predist": "rimraf dist/*", - "dist": "npm run docs && npm run build:min", - "postdist": "copyfiles -f \"{bundles,packages}/*/dist/*\" dist", + "predist": "rimraf dist/* && npm run build:prod", + "dist": "npm run docs", + "postdist": "copyfiles -f bundles/*/dist/* dist && copyfiles -f packages/*/dist/* dist/packages", "prerelease": "npm run clean:build && npm test", - "postversion": "npm run build && npm run build:min", + "postversion": "npm run build:prod", "release": "lerna publish" }, "pre-commit": [ @@ -38,6 +39,7 @@ "@lerna/project": "^3.8.5", "@pixi/jsdoc-template": "^2.4.2", "copyfiles": "^2.1.0", + "cross-env": "^5.2.0", "electron": "^4.0.1", "eslint": "^5.10.0", "floss": "^2.1.5", @@ -54,6 +56,7 @@ "rollup-plugin-replace": "^2.1.0", "rollup-plugin-sourcemaps": "^0.4.2", "rollup-plugin-string": "^2.0.2", + "rollup-plugin-terser": "^4.0.4", "tsd-jsdoc": "^2.1.2" } } diff --git a/packages/accessibility/package.json b/packages/accessibility/package.json index c905a27..765e54b 100644 --- a/packages/accessibility/package.json +++ b/packages/accessibility/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/accessibility.js", "module": "lib/accessibility.es.js", + "bundle": "dist/accessibility.js", + "namespace": "PIXI.accessibility", "description": "Accessibility Plugin for visually impared users", "author": "Mat Groves", "contributors": [ @@ -22,13 +24,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/accessibility/src/AccessibilityManager.js b/packages/accessibility/src/AccessibilityManager.js index 5908bfe..f3bf230 100644 --- a/packages/accessibility/src/AccessibilityManager.js +++ b/packages/accessibility/src/AccessibilityManager.js @@ -1,6 +1,5 @@ -import Device from 'ismobilejs'; import accessibleTarget from './accessibleTarget'; -import { removeItems } from '@pixi/utils'; +import { removeItems, isMobile } from '@pixi/utils'; import { DisplayObject } from '@pixi/display'; // add some extra variables to the container.. @@ -42,7 +41,7 @@ * @private */ this._hookDiv = null; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { this.createTouchHook(); } diff --git a/packages/accessibility/test/AccessibilityManager.js b/packages/accessibility/test/AccessibilityManager.js index 662ac61..fdb10ac 100644 --- a/packages/accessibility/test/AccessibilityManager.js +++ b/packages/accessibility/test/AccessibilityManager.js @@ -1,6 +1,6 @@ const { AccessibilityManager } = require('../'); const { CanvasRenderer } = require('@pixi/canvas-renderer'); -const Device = require('ismobilejs'); +const { isMobile } = require('@pixi/utils'); describe('PIXI.accessibility.AccessibilityManager', function () { @@ -29,9 +29,9 @@ it('should remove touch hook when destroyed', function () { - const phone = Device.phone; + const phone = isMobile.phone; - Device.phone = true; + isMobile.phone = true; const manager = new AccessibilityManager(); const hookDiv = manager._hookDiv; @@ -39,6 +39,6 @@ expect(document.body.contains(hookDiv)).to.be.true; manager.destroy(); expect(document.body.contains(hookDiv)).to.be.false; - Device.phone = phone; + isMobile.phone = phone; }); }); diff --git a/packages/app/package.json b/packages/app/package.json index 6ee1821..946cdfa 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/app.js", "module": "lib/app.es.js", + "bundle": "dist/app.js", "description": "Convenience class to create a new PixiJS application", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-display/package.json b/packages/canvas/canvas-display/package.json index 08ddd4c..9fb7523 100644 --- a/packages/canvas/canvas-display/package.json +++ b/packages/canvas/canvas-display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-display.js", "module": "lib/canvas-display.es.js", + "bundle": "dist/canvas-display.js", "description": "Canvas mixin for the display package", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-extract/package.json b/packages/canvas/canvas-extract/package.json index cd1bdfa..9f9102b 100644 --- a/packages/canvas/canvas-extract/package.json +++ b/packages/canvas/canvas-extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-extract.js", "module": "lib/canvas-extract.es.js", + "bundle": "dist/canvas-extract.js", + "namespace": "PIXI.extract", "description": "Canvas mixin for the extract package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-graphics/package.json b/packages/canvas/canvas-graphics/package.json index ef92d3c..9495bb2 100644 --- a/packages/canvas/canvas-graphics/package.json +++ b/packages/canvas/canvas-graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-graphics.js", "module": "lib/canvas-graphics.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the graphics package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-mesh/package.json b/packages/canvas/canvas-mesh/package.json index cb7086a..b7348b0 100644 --- a/packages/canvas/canvas-mesh/package.json +++ b/packages/canvas/canvas-mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-mesh.js", "module": "lib/canvas-mesh.es.js", + "bundle": "dist/canvas-mesh.js", "description": "Canvas mixin for the mesh package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-particles/package.json b/packages/canvas/canvas-particles/package.json index 986bedc..3485cbe 100644 --- a/packages/canvas/canvas-particles/package.json +++ b/packages/canvas/canvas-particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-graphics.js", "description": "Canvas mixin for the particles package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/particles": "^5.0.0-rc.2" diff --git a/packages/canvas/canvas-prepare/package.json b/packages/canvas/canvas-prepare/package.json index 3569c22..509100a 100644 --- a/packages/canvas/canvas-prepare/package.json +++ b/packages/canvas/canvas-prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-prepare.js", "module": "lib/canvas-prepare.es.js", + "bundle": "dist/canvas-prepare.js", + "namespace": "PIXI.prepare", "description": "Canvas mixin for the prepare package", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-renderer/package.json b/packages/canvas/canvas-renderer/package.json index ad75b57..d67ccf6 100644 --- a/packages/canvas/canvas-renderer/package.json +++ b/packages/canvas/canvas-renderer/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-renderer.js", "module": "lib/canvas-renderer.es.js", + "bundle": "dist/canvas-renderer.js", "description": "Rendering using the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite-tiling/package.json b/packages/canvas/canvas-sprite-tiling/package.json index e3b224b..1f49e57 100644 --- a/packages/canvas/canvas-sprite-tiling/package.json +++ b/packages/canvas/canvas-sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite-tiling.js", "module": "lib/canvas-sprite-tiling.es.js", + "bundle": "dist/canvas-sprite-tiling.js", "description": "Canvas mixin for the sprite-tiling package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/canvas/canvas-sprite/package.json b/packages/canvas/canvas-sprite/package.json index 939b701..3e5082b 100644 --- a/packages/canvas/canvas-sprite/package.json +++ b/packages/canvas/canvas-sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/canvas-sprite.js", "module": "lib/canvas-sprite.es.js", + "bundle": "dist/canvas-sprite.js", "description": "Canvas mixin for the sprite package", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/canvas-renderer": "^5.0.0-rc.2", diff --git a/packages/constants/package.json b/packages/constants/package.json index 77a8be0..a93d8ef 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/constants.js", "module": "lib/constants.es.js", + "bundle": "dist/constants.js", "description": "Constants used across PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,11 +23,9 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], - "dependencies": { - "ismobilejs": "^0.5.1" - }, "devDependencies": { "floss": "^2.1.5" } diff --git a/packages/core/package.json b/packages/core/package.json index ebb5a92..1498d7b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/core.js", "module": "lib/core.es.js", + "bundle": "dist/core.js", "description": "Core PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", @@ -31,9 +33,7 @@ "@pixi/runner": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/core/src/AbstractRenderer.js b/packages/core/src/AbstractRenderer.js index 22c939c..d58cbfa 100644 --- a/packages/core/src/AbstractRenderer.js +++ b/packages/core/src/AbstractRenderer.js @@ -1,10 +1,9 @@ -import { hex2string, hex2rgb, deprecation } from '@pixi/utils'; +import { hex2string, hex2rgb, deprecation, EventEmitter } from '@pixi/utils'; import { Matrix, Rectangle } from '@pixi/math'; import { RENDERER_TYPE } from '@pixi/constants'; import { settings } from '@pixi/settings'; import { Container } from '@pixi/display'; import RenderTexture from './renderTexture/RenderTexture'; -import EventEmitter from 'eventemitter3'; const tempMatrix = new Matrix(); diff --git a/packages/core/src/fragments/default.vert b/packages/core/src/fragments/default.vert new file mode 100755 index 0000000..1b744d2 --- /dev/null +++ b/packages/core/src/fragments/default.vert @@ -0,0 +1,12 @@ +attribute vec2 aVertexPosition; +attribute vec2 aTextureCoord; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +void main(void) +{ + gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); + vTextureCoord = aTextureCoord; +} \ No newline at end of file diff --git a/packages/core/src/fragments/defaultFilter.vert b/packages/core/src/fragments/defaultFilter.vert new file mode 100644 index 0000000..66dd459 --- /dev/null +++ b/packages/core/src/fragments/defaultFilter.vert @@ -0,0 +1,26 @@ +attribute vec2 aVertexPosition; + +uniform mat3 projectionMatrix; + +varying vec2 vTextureCoord; + +uniform vec4 inputSize; +uniform vec4 outputFrame; + +vec4 filterVertexPosition( void ) +{ + vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; + + return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); +} + +vec2 filterTextureCoord( void ) +{ + return aVertexPosition * (outputFrame.zw * inputSize.zw); +} + +void main(void) +{ + gl_Position = filterVertexPosition(); + vTextureCoord = filterTextureCoord(); +} diff --git a/packages/core/src/fragments/index.js b/packages/core/src/fragments/index.js new file mode 100644 index 0000000..720b463 --- /dev/null +++ b/packages/core/src/fragments/index.js @@ -0,0 +1,16 @@ +import defaultVertex from './default.vert'; +import defaultFilterVertex from './defaultFilter.vert'; + +/** + * Default vertex shader + * @memberof PIXI + * @member {string} defaultVertex + */ + +/** + * Default filter vertex shader + * @memberof PIXI + * @member {string} defaultFilterVertex + */ + +export { defaultVertex, defaultFilterVertex }; diff --git a/packages/core/src/index.js b/packages/core/src/index.js index d030b38..e7bee54 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -7,6 +7,7 @@ export { resources }; export * from './autoDetectRenderer'; +export * from './fragments'; export { default as System } from './System'; export { default as Renderer } from './Renderer'; export { default as AbstractRenderer } from './AbstractRenderer'; diff --git a/packages/core/src/textures/BaseTexture.js b/packages/core/src/textures/BaseTexture.js index 8798d39..4d4dbf0 100644 --- a/packages/core/src/textures/BaseTexture.js +++ b/packages/core/src/textures/BaseTexture.js @@ -1,4 +1,4 @@ -import { uid, BaseTextureCache, TextureCache, isPow2 } from '@pixi/utils'; +import { uid, BaseTextureCache, TextureCache, isPow2, EventEmitter } from '@pixi/utils'; import { FORMATS, TARGETS, TYPES, SCALE_MODES } from '@pixi/constants'; import Resource from './resources/Resource'; @@ -6,7 +6,6 @@ import { autoDetectResource } from './resources/autoDetectResource'; import { settings } from '@pixi/settings'; -import EventEmitter from 'eventemitter3'; const defaultBufferOptions = { scaleMode: SCALE_MODES.NEAREST, diff --git a/packages/core/src/textures/Texture.js b/packages/core/src/textures/Texture.js index a250006..12793a9 100644 --- a/packages/core/src/textures/Texture.js +++ b/packages/core/src/textures/Texture.js @@ -2,10 +2,9 @@ import ImageResource from './resources/ImageResource'; import CanvasResource from './resources/CanvasResource'; import TextureUvs from './TextureUvs'; -import EventEmitter from 'eventemitter3'; import { settings } from '@pixi/settings'; import { Rectangle, Point } from '@pixi/math'; -import { uid, TextureCache, getResolutionOfUrl } from '@pixi/utils'; +import { uid, TextureCache, getResolutionOfUrl, EventEmitter } from '@pixi/utils'; const DEFAULT_UVS = new TextureUvs(); diff --git a/packages/display/package.json b/packages/display/package.json index 7917e5b..091428b 100644 --- a/packages/display/package.json +++ b/packages/display/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/display.js", "module": "lib/display.es.js", + "bundle": "dist/display.js", "description": "Core display functionality", "author": "Mat Groves", "contributors": [ @@ -22,13 +23,13 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/math": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/display/src/DisplayObject.js b/packages/display/src/DisplayObject.js index 216ca4a..83f7ff9 100644 --- a/packages/display/src/DisplayObject.js +++ b/packages/display/src/DisplayObject.js @@ -1,4 +1,4 @@ -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { Rectangle, Transform, RAD_TO_DEG, DEG_TO_RAD } from '@pixi/math'; import Bounds from './Bounds'; // _tempDisplayObjectParent = new DisplayObject(); diff --git a/packages/extract/package.json b/packages/extract/package.json index aceecfb..b565c01 100644 --- a/packages/extract/package.json +++ b/packages/extract/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/extract.js", "module": "lib/extract.es.js", + "bundle": "dist/extract.js", + "namespace": "PIXI.extract", "description": "Extract raw graphics data from renderer", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-alpha/package.json b/packages/filters/filter-alpha/package.json index 058a3ea..4f4e9fa 100644 --- a/packages/filters/filter-alpha/package.json +++ b/packages/filters/filter-alpha/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-alpha.js", "module": "lib/filter-alpha.es.js", + "bundle": "dist/filter-alpha.js", + "namespace": "PIXI.filters", "description": "Filter that applies alpha evenly across the entire display object and any opaque elements it contains", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-alpha/src/AlphaFilter.js b/packages/filters/filter-alpha/src/AlphaFilter.js index 422e7bd..343e3c1 100644 --- a/packages/filters/filter-alpha/src/AlphaFilter.js +++ b/packages/filters/filter-alpha/src/AlphaFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultVertex } from '@pixi/fragments'; +import { Filter, defaultVertex } from '@pixi/core'; import fragment from './alpha.frag'; /** diff --git a/packages/filters/filter-blur/package.json b/packages/filters/filter-blur/package.json index 4a84609..262a813 100644 --- a/packages/filters/filter-blur/package.json +++ b/packages/filters/filter-blur/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-blur.js", "module": "lib/filter-blur.es.js", + "bundle": "dist/filter-blur.js", + "namespace": "PIXI.filters", "description": "Filter that blurs the display object", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-color-matrix/package.json b/packages/filters/filter-color-matrix/package.json index ffdf860..47607e2 100644 --- a/packages/filters/filter-color-matrix/package.json +++ b/packages/filters/filter-color-matrix/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-color-matrix.js", "module": "lib/filter-color-matrix.es.js", + "bundle": "dist/filter-color-matrix.js", + "namespace": "PIXI.filters", "description": "Filter that lets you change RGBA via a 5x4 matrix transformation", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js index f18e199..5be34a7 100644 --- a/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js +++ b/packages/filters/filter-color-matrix/src/ColorMatrixFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './colorMatrix.frag'; /** diff --git a/packages/filters/filter-displacement/package.json b/packages/filters/filter-displacement/package.json index fe601c4..38042a4 100644 --- a/packages/filters/filter-displacement/package.json +++ b/packages/filters/filter-displacement/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-displacement.js", "module": "lib/filter-displacement.es.js", + "bundle": "dist/filter-displacement.js", + "namespace": "PIXI.filters", "description": "Filter that allows offsetting of pixel values to create warping effects", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/filters/filter-fxaa/package.json b/packages/filters/filter-fxaa/package.json index d229ae1..05ad0fc 100644 --- a/packages/filters/filter-fxaa/package.json +++ b/packages/filters/filter-fxaa/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-fxaa.js", "module": "lib/filter-fxaa.es.js", + "bundle": "dist/filter-fxaa.js", + "namespace": "PIXI.filters", "description": "Filter for fast approximate anti-aliasing", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2" diff --git a/packages/filters/filter-noise/package.json b/packages/filters/filter-noise/package.json index 645431a..997310f 100644 --- a/packages/filters/filter-noise/package.json +++ b/packages/filters/filter-noise/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/filter-noise.js", "module": "lib/filter-noise.es.js", + "bundle": "dist/filter-noise.js", + "namespace": "PIXI.filters", "description": "Filter that applies noise to a display object", "author": "Mat Groves", "contributors": [ @@ -19,11 +21,11 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { - "@pixi/core": "^5.0.0-rc.2", - "@pixi/fragments": "^5.0.0-rc.2" + "@pixi/core": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/filters/filter-noise/src/NoiseFilter.js b/packages/filters/filter-noise/src/NoiseFilter.js index 30facbe..497df85 100644 --- a/packages/filters/filter-noise/src/NoiseFilter.js +++ b/packages/filters/filter-noise/src/NoiseFilter.js @@ -1,5 +1,4 @@ -import { Filter } from '@pixi/core'; -import { defaultFilterVertex } from '@pixi/fragments'; +import { Filter, defaultFilterVertex } from '@pixi/core'; import fragment from './noise.frag'; /** diff --git a/packages/fragments/LICENSE b/packages/fragments/LICENSE deleted file mode 100644 index 148e3eb..0000000 --- a/packages/fragments/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License - -Copyright (c) 2013-2018 Mathew Groves, Chad Engler - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/packages/fragments/README.md b/packages/fragments/README.md deleted file mode 100644 index b70d84b..0000000 --- a/packages/fragments/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# @pixi/fragments - -## Installation - -```bash -npm install @pixi/fragments -``` - -## Usage - -```js -import '@pixi/fragments'; -``` \ No newline at end of file diff --git a/packages/fragments/package.json b/packages/fragments/package.json deleted file mode 100644 index 20d8069..0000000 --- a/packages/fragments/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "@pixi/fragments", - "version": "5.0.0-rc.2", - "main": "lib/fragments.js", - "module": "lib/fragments.es.js", - "description": "Core fragment shaders", - "author": "Mat Groves", - "contributors": [ - "Matt Karl " - ], - "homepage": "http://pixijs.com/", - "bugs": "https://github.com/pixijs/pixi.js/issues", - "license": "MIT", - "repository": { - "type": "git", - "url": "https://github.com/pixijs/pixi.js.git" - }, - "publishConfig": { - "access": "public" - }, - "files": [ - "lib" - ], - "dependencies": { - "@pixi/core": "^5.0.0-rc.2" - }, - "devDependencies": { - "floss": "^2.1.5" - } -} diff --git a/packages/fragments/src/default.vert b/packages/fragments/src/default.vert deleted file mode 100755 index 1b744d2..0000000 --- a/packages/fragments/src/default.vert +++ /dev/null @@ -1,12 +0,0 @@ -attribute vec2 aVertexPosition; -attribute vec2 aTextureCoord; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -void main(void) -{ - gl_Position = vec4((projectionMatrix * vec3(aVertexPosition, 1.0)).xy, 0.0, 1.0); - vTextureCoord = aTextureCoord; -} \ No newline at end of file diff --git a/packages/fragments/src/defaultFilter.vert b/packages/fragments/src/defaultFilter.vert deleted file mode 100644 index 66dd459..0000000 --- a/packages/fragments/src/defaultFilter.vert +++ /dev/null @@ -1,26 +0,0 @@ -attribute vec2 aVertexPosition; - -uniform mat3 projectionMatrix; - -varying vec2 vTextureCoord; - -uniform vec4 inputSize; -uniform vec4 outputFrame; - -vec4 filterVertexPosition( void ) -{ - vec2 position = aVertexPosition * max(outputFrame.zw, vec2(0.)) + outputFrame.xy; - - return vec4((projectionMatrix * vec3(position, 1.0)).xy, 0.0, 1.0); -} - -vec2 filterTextureCoord( void ) -{ - return aVertexPosition * (outputFrame.zw * inputSize.zw); -} - -void main(void) -{ - gl_Position = filterVertexPosition(); - vTextureCoord = filterTextureCoord(); -} diff --git a/packages/fragments/src/index.js b/packages/fragments/src/index.js deleted file mode 100644 index 0daa463..0000000 --- a/packages/fragments/src/index.js +++ /dev/null @@ -1,4 +0,0 @@ -import defaultVertex from './default.vert'; -import defaultFilterVertex from './defaultFilter.vert'; - -export { defaultVertex, defaultFilterVertex }; diff --git a/packages/graphics/package.json b/packages/graphics/package.json index 02a6acd..f4f83e7 100644 --- a/packages/graphics/package.json +++ b/packages/graphics/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/graphics.js", "module": "lib/graphics.es.js", + "bundle": "dist/graphics.js", "description": "Draw primitive shapes such as lines, circles and rectangles to the display", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/interaction/package.json b/packages/interaction/package.json index 4bd1844..ed20f03 100644 --- a/packages/interaction/package.json +++ b/packages/interaction/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/interaction.js", "module": "lib/interaction.es.js", + "bundle": "dist/interaction.js", + "namespace": "PIXI.interaction", "description": "Plugin for handling mouse, touch and pointer events", "author": "Mat Groves", "contributors": [ @@ -22,15 +24,15 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/display": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", "@pixi/ticker": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "@pixi/canvas-display": "^5.0.0-rc.2", diff --git a/packages/interaction/src/InteractionManager.js b/packages/interaction/src/InteractionManager.js index cd3d3fd..f2932fa 100644 --- a/packages/interaction/src/InteractionManager.js +++ b/packages/interaction/src/InteractionManager.js @@ -4,7 +4,7 @@ import InteractionData from './InteractionData'; import InteractionEvent from './InteractionEvent'; import InteractionTrackingData from './InteractionTrackingData'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import interactiveTarget from './interactiveTarget'; // Mix interactiveTarget into DisplayObject.prototype, diff --git a/packages/loaders/package.json b/packages/loaders/package.json index f82f7a7..47304ea 100644 --- a/packages/loaders/package.json +++ b/packages/loaders/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/loaders.js", "module": "lib/loaders.es.js", + "bundle": "dist/loaders.js", "description": "Load assets and resources", "author": "Mat Groves", "contributors": [ @@ -22,12 +23,12 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/utils": "^5.0.0-rc.2", - "eventemitter3": "^3.1.0", "resource-loader": "^2.2.3" }, "devDependencies": { diff --git a/packages/loaders/src/Loader.js b/packages/loaders/src/Loader.js index 15d29ef..1f728c3 100644 --- a/packages/loaders/src/Loader.js +++ b/packages/loaders/src/Loader.js @@ -1,5 +1,5 @@ import ResourceLoader from 'resource-loader'; -import EventEmitter from 'eventemitter3'; +import { EventEmitter } from '@pixi/utils'; import { blobMiddlewareFactory } from 'resource-loader/lib/middlewares/parsing/blob'; import TextureLoader from './TextureLoader'; diff --git a/packages/math/package.json b/packages/math/package.json index 706a49a..f88e48c 100644 --- a/packages/math/package.json +++ b/packages/math/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/math.js", "module": "lib/math.es.js", + "bundle": "dist/math.js", "description": "Collection of math utilities", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/mesh-extras/package.json b/packages/mesh-extras/package.json index 7016830..b188a55 100644 --- a/packages/mesh-extras/package.json +++ b/packages/mesh-extras/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh-extras.js", "module": "lib/mesh-extras.es.js", + "bundle": "dist/mesh-extras.js", "description": "Custom Mesh display objects, like Rope and Plane", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mesh/package.json b/packages/mesh/package.json index dfb8f6b..53c81d9 100644 --- a/packages/mesh/package.json +++ b/packages/mesh/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mesh.js", "module": "lib/mesh.es.js", + "bundle": "dist/mesh.js", "description": "Core Mesh functionality", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/mixin-cache-as-bitmap/package.json b/packages/mixin-cache-as-bitmap/package.json index 62493c0..682a49a 100644 --- a/packages/mixin-cache-as-bitmap/package.json +++ b/packages/mixin-cache-as-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-cache-as-bitmap.js", "module": "lib/mixin-cache-as-bitmap.es.js", + "bundle": "dist/mixin-cache-as-bitmap.js", "description": "Mixin to allow caching container and its children to a bitmap texture", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/mixin-get-child-by-name/package.json b/packages/mixin-get-child-by-name/package.json index 69025ad..288be23 100644 --- a/packages/mixin-get-child-by-name/package.json +++ b/packages/mixin-get-child-by-name/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-child-by-name.js", "module": "lib/mixin-get-child-by-name.es.js", + "bundle": "dist/mixin-get-child-by-name.js", "description": "Mixin function to find a child DisplayObject by name", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2" diff --git a/packages/mixin-get-global-position/package.json b/packages/mixin-get-global-position/package.json index c96c22e..65cfbea 100644 --- a/packages/mixin-get-global-position/package.json +++ b/packages/mixin-get-global-position/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/mixin-get-global-position.js", "module": "lib/mixin-get-global-position.es.js", + "bundle": "dist/mixin-get-global-position.js", "description": "Mixin to find the global position of a DisplayObject", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/display": "^5.0.0-rc.2", diff --git a/packages/particles/package.json b/packages/particles/package.json index d254a9e..f4427e9 100644 --- a/packages/particles/package.json +++ b/packages/particles/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/particles.js", "module": "lib/particles.es.js", + "bundle": "dist/particles.js", "description": "Render many sprite particles as efficiently as possible", "author": "Mat Groves", "contributors": [ @@ -19,7 +20,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/polyfill/package.json b/packages/polyfill/package.json index d9cca69..5459ed4 100644 --- a/packages/polyfill/package.json +++ b/packages/polyfill/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/polyfill.js", "module": "lib/polyfill.es.js", + "bundle": "dist/polyfill.js", + "standalone": true, "description": "Support for legacy browser JavaScript environments", "author": "Mat Groves", "contributors": [ @@ -19,7 +21,8 @@ "access": "public" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "es6-promise-polyfill": "^1.2.0", diff --git a/packages/prepare/package.json b/packages/prepare/package.json index 9b82c73..0a802b8 100644 --- a/packages/prepare/package.json +++ b/packages/prepare/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/prepare.js", "module": "lib/prepare.es.js", + "bundle": "dist/prepare.js", + "namespace": "PIXI.prepare", "description": "Plugin to allow uploading textures to the GPU", "author": "Mat Groves", "contributors": [ @@ -22,7 +24,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/runner/package.json b/packages/runner/package.json index 9c7ff26..d587131 100644 --- a/packages/runner/package.json +++ b/packages/runner/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/runner.js", "module": "lib/runner.es.js", + "bundle": "dist/runner.js", "description": "A simple alternative to events and signals with an emphasis on performance.", "author": "Mat Groves", "contributors": [ @@ -34,7 +35,8 @@ "benchmark": "cd benchmark && npm start" }, "files": [ - "lib" + "lib", + "dist" ], "devDependencies": { "floss": "^2.1.5" diff --git a/packages/settings/package.json b/packages/settings/package.json index bca33c0..89ba899 100644 --- a/packages/settings/package.json +++ b/packages/settings/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/settings.js", "module": "lib/settings.es.js", + "bundle": "dist/settings.js", "description": "Collecting of user configurable settings used throughout PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "ismobilejs": "^0.5.1" diff --git a/packages/settings/src/index.js b/packages/settings/src/index.js index 1b48028..5430d39 100644 --- a/packages/settings/src/index.js +++ b/packages/settings/src/index.js @@ -1 +1,2 @@ export { default as settings } from './settings'; +export { default as isMobile } from 'ismobilejs'; diff --git a/packages/settings/src/settings.js b/packages/settings/src/settings.js index 07b5b77..89e8c5f 100644 --- a/packages/settings/src/settings.js +++ b/packages/settings/src/settings.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; import maxRecommendedTextures from './utils/maxRecommendedTextures'; import canUploadSameBuffer from './utils/canUploadSameBuffer'; @@ -187,7 +187,7 @@ * @type {PIXI.PRECISION} * @default PIXI.PRECISION.MEDIUM */ - PRECISION_FRAGMENT: Device.apple.device ? 'highp' : 'mediump', + PRECISION_FRAGMENT: isMobile.apple.device ? 'highp' : 'mediump', /** * Can we upload the same buffer in a single frame? diff --git a/packages/settings/src/utils/canUploadSameBuffer.js b/packages/settings/src/utils/canUploadSameBuffer.js index 22cc403..dee9a3a 100644 --- a/packages/settings/src/utils/canUploadSameBuffer.js +++ b/packages/settings/src/utils/canUploadSameBuffer.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * Uploading the same buffer multiple times in a single frame can cause performance issues. @@ -10,5 +10,5 @@ */ export default function canUploadSameBuffer() { - return !Device.apple.device; + return !isMobile.apple.device; } diff --git a/packages/settings/src/utils/maxRecommendedTextures.js b/packages/settings/src/utils/maxRecommendedTextures.js index 91d505a..a8d16bd 100644 --- a/packages/settings/src/utils/maxRecommendedTextures.js +++ b/packages/settings/src/utils/maxRecommendedTextures.js @@ -1,4 +1,4 @@ -import Device from 'ismobilejs'; +import isMobile from 'ismobilejs'; /** * The maximum recommended texture units to use. @@ -17,11 +17,11 @@ { let allowMax = true; - if (Device.tablet || Device.phone) + if (isMobile.tablet || isMobile.phone) { allowMax = false; - if (Device.apple.device) + if (isMobile.apple.device) { const match = (navigator.userAgent).match(/OS (\d+)_(\d+)?/); @@ -36,7 +36,7 @@ } } } - if (Device.android.device) + if (isMobile.android.device) { const match = (navigator.userAgent).match(/Android\s([0-9.]*)/); diff --git a/packages/sprite-animated/package.json b/packages/sprite-animated/package.json index 654394f..caf1af3 100644 --- a/packages/sprite-animated/package.json +++ b/packages/sprite-animated/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-animated.js", "module": "lib/sprite-animated.es.js", + "bundle": "dist/sprite-animated.js", "description": "Sprite Animations as depicted by playing a series of Textures", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/sprite-tiling/package.json b/packages/sprite-tiling/package.json index b09dbbb..9542658 100644 --- a/packages/sprite-tiling/package.json +++ b/packages/sprite-tiling/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite-tiling.js", "module": "lib/sprite-tiling.es.js", + "bundle": "dist/sprite-tiling.js", "description": "Tiling Sprites for faster rendering a tiling image", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/sprite/package.json b/packages/sprite/package.json index 7f5c928..c8dc5bb 100644 --- a/packages/sprite/package.json +++ b/packages/sprite/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/sprite.js", "module": "lib/sprite.es.js", + "bundle": "dist/sprite.js", "description": "Base object for textured objects rendered to the screen", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", diff --git a/packages/spritesheet/package.json b/packages/spritesheet/package.json index 7d397a2..b3af12c 100644 --- a/packages/spritesheet/package.json +++ b/packages/spritesheet/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/spritesheet.js", "module": "lib/spritesheet.es.js", + "bundle": "dist/spritesheet.js", "description": "Spritesheets maintain a collection of Textures on a single image", "author": "Mat Groves", "contributors": [ @@ -22,14 +23,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", "@pixi/loaders": "^5.0.0-rc.2", "@pixi/math": "^5.0.0-rc.2", - "@pixi/utils": "^5.0.0-rc.2", - "url": "^0.11.0" + "@pixi/utils": "^5.0.0-rc.2" }, "devDependencies": { "floss": "^2.1.5" diff --git a/packages/spritesheet/src/SpritesheetLoader.js b/packages/spritesheet/src/SpritesheetLoader.js index 2c515e1..7deb4d1 100644 --- a/packages/spritesheet/src/SpritesheetLoader.js +++ b/packages/spritesheet/src/SpritesheetLoader.js @@ -1,4 +1,4 @@ -import url from 'url'; +import { url } from '@pixi/utils'; import { LoaderResource } from '@pixi/loaders'; import Spritesheet from './Spritesheet'; diff --git a/packages/text-bitmap/package.json b/packages/text-bitmap/package.json index 1825aed..c4427e9 100644 --- a/packages/text-bitmap/package.json +++ b/packages/text-bitmap/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text-bitmap.js", "module": "lib/text-bitmap.es.js", + "bundle": "dist/text-bitmap.js", "description": "Text via bitmap fonts", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/text/package.json b/packages/text/package.json index b0522ac..5be1a1c 100644 --- a/packages/text/package.json +++ b/packages/text/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/text.js", "module": "lib/text.es.js", + "bundle": "dist/text.js", "description": "Text via the Canvas API", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/core": "^5.0.0-rc.2", diff --git a/packages/ticker/package.json b/packages/ticker/package.json index 970841c..dc54d86 100644 --- a/packages/ticker/package.json +++ b/packages/ticker/package.json @@ -3,6 +3,7 @@ "version": "5.0.0-rc.2", "main": "lib/ticker.js", "module": "lib/ticker.es.js", + "bundle": "dist/ticker.js", "description": "Tickers are control the timings within PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,7 +23,8 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/settings": "^5.0.0-rc.2" diff --git a/packages/unsafe-eval/package.json b/packages/unsafe-eval/package.json index 3ad7234..600c274 100644 --- a/packages/unsafe-eval/package.json +++ b/packages/unsafe-eval/package.json @@ -5,9 +5,7 @@ "module": "lib/unsafe-eval.es.js", "bundle": "dist/unsafe-eval.js", "bundleInput": "src/bundle.js", - "bundleOutput": { - "format": "umd" - }, + "standalone": true, "description": "Adds support for environments that disallow support of new Function", "author": "Matt Karl ", "homepage": "http://pixijs.com/", @@ -23,11 +21,5 @@ "files": [ "lib/", "dist/" - ], - "scripts": { - "build:min": "terser dist/unsafe-eval.js -c -m -o dist/unsafe-eval.min.js --source-map \"content='dist/unsafe-eval.js.map',includeSources=true,filename='dist/unsafe-eval.min.js.map',url='unsafe-eval.min.js.map'\" --comments \"/^!/\"" - }, - "devDependencies": { - "terser": "^3.14.1" - } + ] } diff --git a/packages/utils/package.json b/packages/utils/package.json index 8ed639b..db8429b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -3,6 +3,8 @@ "version": "5.0.0-rc.2", "main": "lib/utils.js", "module": "lib/utils.es.js", + "bundle": "dist/utils.js", + "namespace": "PIXI.utils", "description": "Collection of utilities used by PixiJS", "author": "Mat Groves", "contributors": [ @@ -22,14 +24,14 @@ "test": "floss --path test" }, "files": [ - "lib" + "lib", + "dist" ], "dependencies": { "@pixi/constants": "^5.0.0-rc.2", "@pixi/settings": "^5.0.0-rc.2", "earcut": "^2.1.3", "eventemitter3": "^3.1.0", - "ismobilejs": "^0.5.1", "url": "^0.11.0" }, "devDependencies": { diff --git a/packages/utils/src/index.js b/packages/utils/src/index.js index a1cab20..a9db2d0 100644 --- a/packages/utils/src/index.js +++ b/packages/utils/src/index.js @@ -18,16 +18,35 @@ */ /** - * A simple JS library that detects mobile devices + * A simple JS library that detects mobile devices. * * @see {@link https://github.com/kaimallea/isMobile} * * @memberof PIXI.utils - * @function isMobile + * @name isMobile * @type {Object} + * @property {boolean} any - `true` if current platform is tablet or phone device + * @property {boolean} tablet - `true` if current platform large-screen tablet device + * @property {boolean} phone - `true` if current platform small-screen phone device + * @property {object} apple + * @property {boolean} apple.device - `true` if any Apple device + * @property {boolean} apple.tablet - `true` if any Apple iPad + * @property {boolean} apple.phone - `true` if any Apple iPhone + * @property {boolean} apple.ipod - `true` if any iPod + * @property {object} android + * @property {boolean} android.device - `true` if any Android device + * @property {boolean} android.tablet - `true` if any Android tablet + * @property {boolean} android.phone - `true` if any Android phone + * @property {object} amazon + * @property {boolean} amazon.device - `true` if any Silk device + * @property {boolean} amazon.tablet - `true` if any Silk tablet + * @property {boolean} amazon.phone - `true` if any Silk phone + * @property {object} windows + * @property {boolean} windows.device - `true` if any Windows device + * @property {boolean} windows.tablet - `true` if any Windows tablet + * @property {boolean} windows.phone - `true` if any Windows phone */ -import isMobile from 'ismobilejs'; -export { isMobile }; +export { isMobile } from '@pixi/settings'; /** * A high performance event emitter @@ -38,8 +57,7 @@ * @class EventEmitter * @type {EventEmitter} */ -import EventEmitter from 'eventemitter3'; -export { EventEmitter }; +export { default as EventEmitter } from 'eventemitter3'; /** * A polygon triangulation library @@ -53,8 +71,18 @@ * @param {number} [dimensions=2] The number of coordinates per vertex in the input array * @return {number[]} Triangulated polygon */ -import earcut from 'earcut'; -export { earcut }; +export { default as earcut } from 'earcut'; + +/** + * Node.js compatible URL utilities. + * + * @see https://www.npmjs.com/package/url + * + * @memberof PIXI.utils + * @name url + * @type {object} + */ +export { default as url } from 'url'; import './settings'; diff --git a/rollup.config.js b/rollup.config.js index 69faa86..ae76ac6 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -6,6 +6,7 @@ import minimist from 'minimist'; import commonjs from 'rollup-plugin-commonjs'; import replace from 'rollup-plugin-replace'; +import { terser } from 'rollup-plugin-terser'; import batchPackages from '@lerna/batch-packages'; import filterPackages from '@lerna/filter-packages'; import { getPackages } from '@lerna/project'; @@ -63,9 +64,21 @@ const { scope, ignore } = minimist(process.argv.slice(2)); const packages = await getSortedPackages(scope, ignore); + const namespaces = {}; + const pkgData = {}; + + // Create a map of globals to use for bundled packages packages.forEach((pkg) => { - const banner = [ + const data = pkg.toJSON(); + + pkgData[pkg.name] = data; + namespaces[pkg.name] = data.namespace || 'PIXI'; + }); + + packages.forEach((pkg) => + { + let banner = [ `/*!`, ` * ${pkg.name} - v${pkg.version}`, ` * Compiled ${compiled}`, @@ -79,7 +92,13 @@ const external = Object.keys(pkg.dependencies || []); const basePath = path.relative(__dirname, pkg.location); const input = path.join(basePath, 'src/index.js'); - const { main, module, bundle, bundleInput, bundleOutput } = pkg.toJSON(); + const { + main, + module, + bundle, + bundleInput, + bundleOutput, + standalone } = pkgData[pkg.name]; const freeze = false; results.push({ @@ -95,7 +114,7 @@ { banner, file: path.join(basePath, module), - format: 'es', + format: 'esm', freeze, sourcemap, }, @@ -109,18 +128,70 @@ // this will package all dependencies if (bundle) { + const input = path.join(basePath, bundleInput || 'src/index.js'); + const file = path.join(basePath, bundle); + const external = standalone ? null : Object.keys(namespaces); + const globals = standalone ? null : namespaces; + const ns = namespaces[pkg.name]; + const name = pkg.name.replace(/[^a-z]+/g, '_'); + let footer; + + // Ignore self-contained packages like polyfills and unsafe-eval + // as well as the bundles pixi.js and pixi.js-legacy + if (!standalone) + { + footer = `Object.assign(this.${ns}, ${name});`; + + if (ns.includes('.')) + { + const base = ns.split('.')[0]; + + banner += `\nthis.${base} = this.${base} || {};`; + } + + banner += `\nthis.${ns} = this.${ns} || {};`; + } + results.push({ - input: path.join(basePath, bundleInput || 'src/index.js'), + input, + external, output: Object.assign({ banner, - file: path.join(basePath, bundle), + file, format: 'iife', freeze, + globals, + name, + footer, sourcemap, }, bundleOutput), treeshake: false, plugins, }); + + if (process.env.NODE_ENV === 'production') + { + results.push({ + input, + external, + output: Object.assign({ + banner, + file: file.replace(/\.js$/, '.min.js'), + format: 'iife', + freeze, + globals, + name, + footer, + sourcemap, + }, bundleOutput), + treeshake: false, + plugins: [...plugins, terser({ + output: { + comments: (node, comment) => comment.line === 1, + }, + })], + }); + } } });