Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup peer dependencies #452

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions bundles/all-3.8/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { main } = require('@pixi-spine/rollup-config/main');
const pkg = require('./package.json');

const results = main({
globals: {
Expand All @@ -9,10 +10,13 @@ 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',
'@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';
Expand Down
11 changes: 8 additions & 3 deletions bundles/all-4.0/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { main } = require('@pixi-spine/rollup-config/main');
const pkg = require('./package.json');

const results = main({
globals: {
Expand All @@ -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/app', '@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';
Expand Down
12 changes: 8 additions & 4 deletions bundles/all-4.1/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { main } = require('@pixi-spine/rollup-config/main');
const pkg = require('./package.json');

const results = main({
globals: {
Expand All @@ -9,10 +10,13 @@ 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',
'@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';
Expand Down
11 changes: 8 additions & 3 deletions bundles/pixi-spine/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const { main } = require('@pixi-spine/rollup-config/main');
const pkg = require('./package.json');

const results = main({
globals: {
Expand All @@ -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/app', '@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';
Expand Down
7 changes: 4 additions & 3 deletions packages/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
}
}
6 changes: 1 addition & 5 deletions packages/loader-3.8/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
"types": "./index.d.ts",
"namespace": "PIXI.spine",
"peerDependencies": {
"@pixi/app": "^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"
},
"dependencies": {
"@pixi-spine/base": "~3.1.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/loader-4.0/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
"types": "./index.d.ts",
"namespace": "PIXI.spine",
"peerDependencies": {
"@pixi/app": "^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"
},
"dependencies": {
"@pixi-spine/base": "~3.1.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/loader-4.1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
"types": "./index.d.ts",
"namespace": "PIXI.spine",
"peerDependencies": {
"@pixi/app": "^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"
},
"dependencies": {
"@pixi-spine/base": "~3.1.0",
Expand Down
5 changes: 1 addition & 4 deletions packages/loader-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@
"types": "./index.d.ts",
"namespace": "PIXI.spine",
"peerDependencies": {
"@pixi/app": "^6.1.0",
"@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"
},
"dependencies": {
"@pixi-spine/base": "~3.1.0"
Expand Down