Skip to content

Commit

Permalink
Move @babylonjs/* packages to peerDependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonihmig
simonihmig committed Jul 4, 2022
1 parent 7a71508 commit 7efe085
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 77 deletions.
22 changes: 13 additions & 9 deletions blueprints/ember-ecsy-babylon/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ module.exports = {
normalizeEntityName() {},

async afterInstall(/*options*/) {
// Ensure ecsy-babylon is a direct dependency, so ember-auto-import works
await this.addPackagesToProject([
{ name: 'ecsy-babylon', target: this.ownEcsyBabylonVersion },
]);
},

get ownEcsyBabylonVersion() {
const pkg = require('../../package.json');
const version = pkg.dependencies['ecsy-babylon'];
return version;

await this.addPackagesToProject(
[
'ecsy-babylon',
'@babylonjs/core',
'@babylonjs/gui',
'@babylonjs/gui-editor',
'@babylonjs/inspector',
'@babylonjs/loaders',
'@babylonjs/materials',
'@babylonjs/serializers',
].map((name) => ({ name, target: pkg.peerDependencies[name] }))
);
},
};
21 changes: 17 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,11 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"@babylonjs/core": "^5.6.1",
"@babylonjs/inspector": "^5.6.1",
"@babylonjs/loaders": "^5.6.1",
"@ember/render-modifiers": "^2.0.0",
"@ember/test-waiters": "^3.0.0",
"@glimmer/env": "^0.1.7",
"@glimmer/tracking": "^1.0.4",
"ecsy": "^0.4.2",
"ecsy-babylon": "^0.8.0",
"ember-auto-import": "^2.4.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1",
Expand All @@ -50,7 +46,24 @@
"ember-on-resize-modifier": "^1.0.0",
"ember-resources": "^5.0.2"
},
"peerDependencies": {
"@babylonjs/core": "^5.0.0",
"@babylonjs/gui": "^5.0.0",
"@babylonjs/gui-editor": "^5.0.0",
"@babylonjs/inspector": "^5.0.0",
"@babylonjs/loaders": "^5.0.0",
"@babylonjs/materials": "^5.0.0",
"@babylonjs/serializers": "^5.0.0",
"ecsy-babylon": "^0.8.0"
},
"devDependencies": {
"@babylonjs/core": "5.13.2",
"@babylonjs/gui": "5.13.1",
"@babylonjs/gui-editor": "5.13.3",
"@babylonjs/inspector": "5.13.1",
"@babylonjs/loaders": "5.13.3",
"@babylonjs/materials": "5.13.3",
"@babylonjs/serializers": "5.13.3",
"@ember/optional-features": "2.0.0",
"@ember/test-helpers": "2.8.1",
"@embroider/test-setup": "1.8.0",
Expand Down
99 changes: 35 additions & 64 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,69 +969,54 @@
"@babel/helper-validator-identifier" "^7.16.7"
to-fast-properties "^2.0.0"

"@babylonjs/core@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/core/-/core-5.6.1.tgz#11cfe77ab654b254d405648172aef92eb2c0f71b"
integrity sha512-kWXMK+C8IAlhpOIS+WEpA1FHuizrK+nKHCHxc0bnrSQ7ePCIL2Xfxjx+ZE5C2WGB4og135O6+E3msdtp9cETFA==
"@babylonjs/core@5.13.2":
version "5.13.2"
resolved "https://registry.yarnpkg.com/@babylonjs/core/-/core-5.13.2.tgz#ec1530bb461510ec5ce8c6dbe3f570f05e2029b7"
integrity sha512-aemACYnvQS4IVFMDYh6DeZ/seSj6S441HYbUykeXWjLcn7iVJtkQ3f0iqaY4bjFGmk3Fx9hzcaVVQZc/7MfGQw==
dependencies:
tslib "^2.3.1"
tslib "^2.4.0"

"@babylonjs/gui-editor@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/gui-editor/-/gui-editor-5.6.1.tgz#73809d7c86e1dfd6643fa1cef17e4134981474c6"
integrity sha512-+ysA/oUcstXXTluFqiKz6iB/KkpE4km9JQcQWqrpGVomi7Celg+9abVrQlJNILfS4eLcFdcD9tcBB8Mo5ILKAA==
dependencies:
"@babylonjs/core" "^5.6.1"
"@babylonjs/gui" "^5.6.1"
"@babylonjs/[email protected]":
version "5.13.3"
resolved "https://registry.yarnpkg.com/@babylonjs/gui-editor/-/gui-editor-5.13.3.tgz#6fa89a8aa45ab55e7e3e9a51e2dfac6eb6f0e0a2"
integrity sha512-dxKuRiY3Z3Zjwe385Vr1LNrUXvS8hFnXkuo3bdOX9Kffd2YnRiqK1/M7slsIgDGolWWncWo+zwLgvH3fKBM+WQ==

"@babylonjs/gui@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/gui/-/gui-5.6.1.tgz#ec23eacbc1b47f6c642945eac5ef61b043c2c8ec"
integrity sha512-+y9vueh2eFLPG+6wkO/0H8E7Rtz9mkvD9HDKjZZNUmFxE9pLsfjt4HP5uAY3zY8D/hKGQYHaWFWS3kjPjuQkjw==
"@babylonjs/gui@5.13.1":
version "5.13.1"
resolved "https://registry.yarnpkg.com/@babylonjs/gui/-/gui-5.13.1.tgz#20190311524cf3fd8ac27379313190d02c541c5c"
integrity sha512-fLuWjYFhVUgkJuvAowvps6873kR1rC5F6gniYE536aGYQYfmhkMjoxeKh1ku309ofav4L8ciNRaWFNQpGU2/nw==
dependencies:
"@babylonjs/core" "^5.6.1"
tslib "^2.3.1"
tslib "^2.4.0"

"@babylonjs/inspector@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/inspector/-/inspector-5.6.1.tgz#e99fa70ea494f430b89fad1ae7ec9e2c6cc291c3"
integrity sha512-jmiY24/pu9IN0+CgZMMTl4HGsTnekXne8B0CEDuiASHXQClDhDd0XdhBkGTAcynMpOlFvIM03F46kzlifPWA4w==
dependencies:
"@babylonjs/core" "^5.6.1"
"@babylonjs/gui" "^5.6.1"
"@babylonjs/gui-editor" "^5.6.1"
"@babylonjs/loaders" "^5.6.1"
"@babylonjs/materials" "^5.6.1"
"@babylonjs/serializers" "^5.6.1"
"@babylonjs/[email protected]":
version "5.13.1"
resolved "https://registry.yarnpkg.com/@babylonjs/inspector/-/inspector-5.13.1.tgz#735a56e4ce5c62f3cf2da4541ea6eed6aa8dcbbc"
integrity sha512-hN+3yE+dF6RMrnlNvVfUzz3Q6qRC9NSU3NbyxwPJhOnGVax7n1XecfENj10VR1XBCWwGHf02rE6syeOPdPxsHA==
dependencies:
"@fortawesome/fontawesome-svg-core" "^6.1.0"
"@fortawesome/free-regular-svg-icons" "^6.0.0"
"@fortawesome/free-solid-svg-icons" "^6.0.0"

"@babylonjs/loaders@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/loaders/-/loaders-5.6.1.tgz#dbb1df8771810bf454a0257944b8c96b99457205"
integrity sha512-kl6P1EnnfYXF1re/DqocUPOo9ASRCt5jcpcClGe0n/mZpig/AzbgVC+kwCqOXH28LD7AfRkJ6enC1BUrH0b4IA==
"@babylonjs/loaders@5.13.3":
version "5.13.3"
resolved "https://registry.yarnpkg.com/@babylonjs/loaders/-/loaders-5.13.3.tgz#2a03d33c67e4f7f06969e11d5be24c699d89b6ea"
integrity sha512-tbCvW7n9tJZxMN8IGN7u7C+L7W6BM4SNFyOVHuVELVzoOHGtKF75qb4yvxViJgrrRleDUq36m2960O0iDolgJg==
dependencies:
"@babylonjs/core" "^5.6.1"
babylonjs-gltf2interface "^5.6.1"
tslib "^2.3.1"
tslib "^2.4.0"

"@babylonjs/materials@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/materials/-/materials-5.6.1.tgz#2202e5c2e30341293ebb12e09c1d272ecd529e4c"
integrity sha512-Hify+rt3P2gqs2r5oSO1/WYvfFU4XTmP9RaYJeKRRORN6Qlm6jvvSj8OL4Bz1tuDXIzdhZ+ZUkmvcS1dT3iLZA==
"@babylonjs/materials@5.13.3":
version "5.13.3"
resolved "https://registry.yarnpkg.com/@babylonjs/materials/-/materials-5.13.3.tgz#987ed6a883e266df47ab32d17a46e00c03fe93eb"
integrity sha512-zwoIrb4eRQ39mFPj1DNjWScIMtQbMGBE4XBLa9w17V4rSm+CTT2wID/4meRfXjOePjH7eI/BLlP4qxIEcLG/9w==
dependencies:
"@babylonjs/core" "^5.6.1"
tslib "^2.3.1"
tslib "^2.4.0"

"@babylonjs/serializers@^5.6.1":
version "5.6.1"
resolved "https://registry.yarnpkg.com/@babylonjs/serializers/-/serializers-5.6.1.tgz#8a5bf91425ac6ff80b7b707de71ab8d647081001"
integrity sha512-gEYm0D+N8sRAdfsAQfgm9wynweIY8cw1zm7HINIDq+OOLUBAFy6PuVBaq3QnIKju/wgVlI3w0KdwGje1UmPeGQ==
"@babylonjs/serializers@5.13.3":
version "5.13.3"
resolved "https://registry.yarnpkg.com/@babylonjs/serializers/-/serializers-5.13.3.tgz#23379165a380692efd155bdba2e0651b4abdd05d"
integrity sha512-Xky7FoE+F+w7j1mepgJ6oU6JE2nC4UknGhqWKp2psz21c9aUP02BnFVkA6gQd2DfKalW/Rkb3KPcJgVTbZSDBg==
dependencies:
"@babylonjs/core" "^5.6.1"
babylonjs-gltf2interface "^5.6.1"
tslib "^2.3.1"
tslib "^2.4.0"

"@cnakazawa/watch@^1.0.3":
version "1.0.4"
Expand Down Expand Up @@ -3176,11 +3161,6 @@ babylon@^6.18.0:
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==

babylonjs-gltf2interface@^5.6.1:
version "5.6.1"
resolved "https://registry.yarnpkg.com/babylonjs-gltf2interface/-/babylonjs-gltf2interface-5.6.1.tgz#4e700e3a1373000b04b9b93d23a88d78b8eded25"
integrity sha512-FS8aObh4lfDwmd9nlfu+7PiUtc+1fFKe5AAMqKkiUWU8MJc2P+4RkvijUArfMKsO1whh7ee6St5iuTxDi+ltKw==

backbone@^1.1.2:
version "1.4.0"
resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.0.tgz#54db4de9df7c3811c3f032f34749a4cd27f3bd12"
Expand Down Expand Up @@ -5053,15 +5033,6 @@ duplexify@^3.4.2, duplexify@^3.6.0:
readable-stream "^2.0.0"
stream-shift "^1.0.0"

ecsy-babylon@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/ecsy-babylon/-/ecsy-babylon-0.8.0.tgz#58391dbbbd94fd442f8680384fd8ba49d1683647"
integrity sha512-zFu+yae+uIinWbEood4aEnzfCm5s7bOS1w8/IUt6yAZPNZJy/NXWJqb17qDU/1oK9t14botMXYTI1F5qQifHcA==
dependencies:
"@babylonjs/core" "^5.6.1"
"@babylonjs/materials" "^5.6.1"
ecsy "^0.4.2"

ecsy@^0.4.2:
version "0.4.2"
resolved "https://registry.yarnpkg.com/ecsy/-/ecsy-0.4.2.tgz#5d0c78fb248c81f587dfc05c01cb39e8bb2233ab"
Expand Down Expand Up @@ -12532,7 +12503,7 @@ tslib@^1.8.1, tslib@^1.9.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1:
tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
Expand Down

0 comments on commit 7efe085

Please sign in to comment.