From 14b1df985ba653ff23e55bf6458aa76f3c92e492 Mon Sep 17 00:00:00 2001 From: Milton Date: Fri, 5 Aug 2022 15:05:25 -0300 Subject: [PATCH 1/3] Cleanup peer dependencies - Loader packages relied on `@pixi/app` and `resource-loader` which were not used. - Added `@pixi/extensions` to be compatible with 6.5.1 - Added a `peerDependenciesMeta` to make `@pixi/extensions` optional since is not needed before 6.5.1 --- bundles/all-3.8/rollup.config.js | 2 +- bundles/all-4.0/rollup.config.js | 2 +- bundles/all-4.1/rollup.config.js | 2 +- bundles/pixi-spine/rollup.config.js | 2 +- packages/loader-3.8/package.json | 10 +++++++--- packages/loader-4.0/package.json | 10 +++++++--- packages/loader-4.1/package.json | 10 +++++++--- packages/loader-base/package.json | 10 +++++++--- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/bundles/all-3.8/rollup.config.js b/bundles/all-3.8/rollup.config.js index 90d4eb10..a8d59236 100644 --- a/bundles/all-3.8/rollup.config.js +++ b/bundles/all-3.8/rollup.config.js @@ -11,7 +11,7 @@ const results = main({ // TODO: get sorted deps of all our @pixi-spine deps -const umdDeps = ['@pixi/app', '@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', +const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; diff --git a/bundles/all-4.0/rollup.config.js b/bundles/all-4.0/rollup.config.js index f8b9175e..eb23df3b 100644 --- a/bundles/all-4.0/rollup.config.js +++ b/bundles/all-4.0/rollup.config.js @@ -11,7 +11,7 @@ const results = main({ // TODO: get sorted deps of all our @pixi-spine deps -const umdDeps = ['@pixi/app', '@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', +const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; diff --git a/bundles/all-4.1/rollup.config.js b/bundles/all-4.1/rollup.config.js index f8b9175e..eb23df3b 100644 --- a/bundles/all-4.1/rollup.config.js +++ b/bundles/all-4.1/rollup.config.js @@ -11,7 +11,7 @@ const results = main({ // TODO: get sorted deps of all our @pixi-spine deps -const umdDeps = ['@pixi/app', '@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', +const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; diff --git a/bundles/pixi-spine/rollup.config.js b/bundles/pixi-spine/rollup.config.js index 45a1908a..a98215d1 100644 --- a/bundles/pixi-spine/rollup.config.js +++ b/bundles/pixi-spine/rollup.config.js @@ -13,7 +13,7 @@ const results = main({ // TODO: get sorted deps of all our @pixi-spine deps -const umdDeps = ['@pixi/app', '@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', +const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; diff --git a/packages/loader-3.8/package.json b/packages/loader-3.8/package.json index 0b8d0682..14724d70 100644 --- a/packages/loader-3.8/package.json +++ b/packages/loader-3.8/package.json @@ -8,11 +8,15 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/app": "^6.1.0", + "@pixi/extensions": "^6.5.1", "@pixi/core": "^6.1.0", "@pixi/display": "^6.1.0", - "@pixi/loaders": "^6.1.0", - "resource-loader": "~3.0.1" + "@pixi/loaders": "^6.1.0" + }, + "peerDependenciesMeta": { + "@pixi/extensions": { + "optional": true + } }, "dependencies": { "@pixi-spine/base": "~3.1.0", diff --git a/packages/loader-4.0/package.json b/packages/loader-4.0/package.json index 94dbec56..2e9dd53f 100644 --- a/packages/loader-4.0/package.json +++ b/packages/loader-4.0/package.json @@ -8,11 +8,15 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/app": "^6.1.0", + "@pixi/extensions": "^6.5.1", "@pixi/core": "^6.1.0", "@pixi/display": "^6.1.0", - "@pixi/loaders": "^6.1.0", - "resource-loader": "~3.0.1" + "@pixi/loaders": "^6.1.0" + }, + "peerDependenciesMeta": { + "@pixi/extensions": { + "optional": true + } }, "dependencies": { "@pixi-spine/base": "~3.1.0", diff --git a/packages/loader-4.1/package.json b/packages/loader-4.1/package.json index 01bf4504..1292e823 100644 --- a/packages/loader-4.1/package.json +++ b/packages/loader-4.1/package.json @@ -8,11 +8,15 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/app": "^6.1.0", + "@pixi/extensions": "^6.5.1", "@pixi/core": "^6.1.0", "@pixi/display": "^6.1.0", - "@pixi/loaders": "^6.1.0", - "resource-loader": "~3.0.1" + "@pixi/loaders": "^6.1.0" + }, + "peerDependenciesMeta": { + "@pixi/extensions": { + "optional": true + } }, "dependencies": { "@pixi-spine/base": "~3.1.0", diff --git a/packages/loader-base/package.json b/packages/loader-base/package.json index dac75019..9975eba9 100644 --- a/packages/loader-base/package.json +++ b/packages/loader-base/package.json @@ -8,12 +8,16 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/app": "^6.1.0", + "@pixi/extensions": "^6.5.1", "@pixi/constants": "^6.1.0", "@pixi/core": "^6.1.0", "@pixi/display": "^6.1.0", - "@pixi/loaders": "^6.1.0", - "resource-loader": "~3.0.1" + "@pixi/loaders": "^6.1.0" + }, + "peerDependenciesMeta": { + "@pixi/extensions": { + "optional": true + } }, "dependencies": { "@pixi-spine/base": "~3.1.0" From e8bfd19df7fc6cf06f11b3a8e43f5020f5561907 Mon Sep 17 00:00:00 2001 From: Milton Date: Fri, 5 Aug 2022 17:00:50 -0300 Subject: [PATCH 2/3] Removed unused peerDeps Interesting note about spine-base dependencies: `"@pixi/runner": "^6.1.0",` ,`"@pixi/settings": "^6.1.0",` and `"@pixi/extensions": "^6.1.0"` are only needed to generate the typescript definition file so they were moved to devDependencies --- packages/base/package.json | 7 ++++--- packages/loader-3.8/package.json | 8 -------- packages/loader-4.0/package.json | 6 ------ packages/loader-4.1/package.json | 6 ------ packages/loader-base/package.json | 7 ------- 5 files changed, 4 insertions(+), 30 deletions(-) diff --git a/packages/base/package.json b/packages/base/package.json index fb6547b3..eb7aae25 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -15,8 +15,6 @@ "@pixi/math": "^6.1.0", "@pixi/mesh": "^6.1.0", "@pixi/mesh-extras": "^6.1.0", - "@pixi/runner": "^6.1.0", - "@pixi/settings": "^6.1.0", "@pixi/sprite": "^6.1.0", "@pixi/utils": "^6.1.0" }, @@ -53,6 +51,9 @@ "rimraf": "3.0.2", "rollup": "^2.53.3", "tslib": "~2.2.0", - "typescript": "~4.3.0" + "typescript": "~4.3.0", + "@pixi/runner": "^6.1.0", + "@pixi/settings": "^6.1.0", + "@pixi/extensions": "^6.1.0" } } diff --git a/packages/loader-3.8/package.json b/packages/loader-3.8/package.json index 14724d70..6d43eda8 100644 --- a/packages/loader-3.8/package.json +++ b/packages/loader-3.8/package.json @@ -8,16 +8,8 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/extensions": "^6.5.1", - "@pixi/core": "^6.1.0", - "@pixi/display": "^6.1.0", "@pixi/loaders": "^6.1.0" }, - "peerDependenciesMeta": { - "@pixi/extensions": { - "optional": true - } - }, "dependencies": { "@pixi-spine/base": "~3.1.0", "@pixi-spine/loader-base": "~3.1.0", diff --git a/packages/loader-4.0/package.json b/packages/loader-4.0/package.json index 2e9dd53f..fc609799 100644 --- a/packages/loader-4.0/package.json +++ b/packages/loader-4.0/package.json @@ -8,16 +8,10 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/extensions": "^6.5.1", "@pixi/core": "^6.1.0", "@pixi/display": "^6.1.0", "@pixi/loaders": "^6.1.0" }, - "peerDependenciesMeta": { - "@pixi/extensions": { - "optional": true - } - }, "dependencies": { "@pixi-spine/base": "~3.1.0", "@pixi-spine/loader-base": "~3.1.0", diff --git a/packages/loader-4.1/package.json b/packages/loader-4.1/package.json index 1292e823..7c2bea74 100644 --- a/packages/loader-4.1/package.json +++ b/packages/loader-4.1/package.json @@ -8,16 +8,10 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/extensions": "^6.5.1", "@pixi/core": "^6.1.0", "@pixi/display": "^6.1.0", "@pixi/loaders": "^6.1.0" }, - "peerDependenciesMeta": { - "@pixi/extensions": { - "optional": true - } - }, "dependencies": { "@pixi-spine/base": "~3.1.0", "@pixi-spine/loader-base": "~3.1.0", diff --git a/packages/loader-base/package.json b/packages/loader-base/package.json index 9975eba9..910734f6 100644 --- a/packages/loader-base/package.json +++ b/packages/loader-base/package.json @@ -8,17 +8,10 @@ "types": "./index.d.ts", "namespace": "PIXI.spine", "peerDependencies": { - "@pixi/extensions": "^6.5.1", "@pixi/constants": "^6.1.0", "@pixi/core": "^6.1.0", - "@pixi/display": "^6.1.0", "@pixi/loaders": "^6.1.0" }, - "peerDependenciesMeta": { - "@pixi/extensions": { - "optional": true - } - }, "dependencies": { "@pixi-spine/base": "~3.1.0" }, From 9e70dd9326e40f2e4a8d59adb6967e391c6ab819 Mon Sep 17 00:00:00 2001 From: eCode Date: Sat, 6 Aug 2022 16:07:55 -0300 Subject: [PATCH 3/3] sorted deps of all our @pixi-spine deps --- bundles/all-3.8/rollup.config.js | 12 ++++++++---- bundles/all-4.0/rollup.config.js | 11 ++++++++--- bundles/all-4.1/rollup.config.js | 12 ++++++++---- bundles/pixi-spine/rollup.config.js | 11 ++++++++--- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/bundles/all-3.8/rollup.config.js b/bundles/all-3.8/rollup.config.js index a8d59236..7596c9ce 100644 --- a/bundles/all-3.8/rollup.config.js +++ b/bundles/all-3.8/rollup.config.js @@ -1,4 +1,5 @@ const { main } = require('@pixi-spine/rollup-config/main'); +const pkg = require('./package.json'); const results = main({ globals: { @@ -9,10 +10,13 @@ const results = main({ }, }); -// TODO: get sorted deps of all our @pixi-spine deps - -const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', - '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; +// Find all the peer deps. Note: This assumes we have only two levels of peer deps. +let umdDeps = []; +const deps = Object.keys(pkg.dependencies || {}); +for (let dep of deps) { + const p = require(`${dep}/package.json`); + umdDeps = umdDeps.concat(Object.keys(p.peerDependencies || {})); +} const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; const licenseSpine = 'is licensed under SPINE-LICENSE\n * http://esotericsoftware.com/spine-runtimes-license'; diff --git a/bundles/all-4.0/rollup.config.js b/bundles/all-4.0/rollup.config.js index eb23df3b..373d9da8 100644 --- a/bundles/all-4.0/rollup.config.js +++ b/bundles/all-4.0/rollup.config.js @@ -1,4 +1,5 @@ const { main } = require('@pixi-spine/rollup-config/main'); +const pkg = require('./package.json'); const results = main({ globals: { @@ -9,10 +10,14 @@ const results = main({ }, }); -// TODO: get sorted deps of all our @pixi-spine deps +// Find all the peer deps. Note: This assumes we have only two levels of peer deps. +let umdDeps = []; +const deps = Object.keys(pkg.dependencies || {}); +for (let dep of deps) { + const p = require(`${dep}/package.json`); + umdDeps = umdDeps.concat(Object.keys(p.peerDependencies || {})); +} -const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', - '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; const licenseSpine = 'is licensed under SPINE-LICENSE\n * http://esotericsoftware.com/spine-runtimes-license'; diff --git a/bundles/all-4.1/rollup.config.js b/bundles/all-4.1/rollup.config.js index eb23df3b..614fb404 100644 --- a/bundles/all-4.1/rollup.config.js +++ b/bundles/all-4.1/rollup.config.js @@ -1,4 +1,5 @@ const { main } = require('@pixi-spine/rollup-config/main'); +const pkg = require('./package.json'); const results = main({ globals: { @@ -9,10 +10,13 @@ const results = main({ }, }); -// TODO: get sorted deps of all our @pixi-spine deps - -const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', - '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; +// Find all the peer deps. Note: This assumes we have only two levels of peer deps. +let umdDeps = []; +const deps = Object.keys(pkg.dependencies || {}); +for (let dep of deps) { + const p = require(`${dep}/package.json`); + umdDeps = umdDeps.concat(Object.keys(p.peerDependencies || {})); +} const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; const licenseSpine = 'is licensed under SPINE-LICENSE\n * http://esotericsoftware.com/spine-runtimes-license'; diff --git a/bundles/pixi-spine/rollup.config.js b/bundles/pixi-spine/rollup.config.js index a98215d1..b223ee86 100644 --- a/bundles/pixi-spine/rollup.config.js +++ b/bundles/pixi-spine/rollup.config.js @@ -1,4 +1,5 @@ const { main } = require('@pixi-spine/rollup-config/main'); +const pkg = require('./package.json'); const results = main({ globals: { @@ -11,10 +12,14 @@ const results = main({ }, }); -// TODO: get sorted deps of all our @pixi-spine deps +// Find all the peer deps. Note: This assumes we have only two levels of peer deps. +let umdDeps = []; +const deps = Object.keys(pkg.dependencies || {}); +for (let dep of deps) { + const p = require(`${dep}/package.json`); + umdDeps = umdDeps.concat(Object.keys(p.peerDependencies || {})); +} -const umdDeps = ['@pixi/constants', '@pixi/core', '@pixi/display', '@pixi/graphics', - '@pixi/loaders', '@pixi/math', '@pixi/mesh-extras', '@pixi/sprite', '@pixi/utils']; const license1 = 'is licensed under the MIT License.\n * http://www.opensource.org/licenses/mit-license'; const licenseSpine = 'is licensed under SPINE-LICENSE\n * http://esotericsoftware.com/spine-runtimes-license';