From 8c931e63a140d0659a8b83171f7431fb862fa600 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 13 Mar 2024 17:06:56 +0000 Subject: [PATCH 1/7] chore: version packages --- .changeset/ten-squids-cheat.md | 6 ------ packages/nft-renderer/CHANGELOG.md | 9 +++++++++ packages/nft-renderer/package.json | 2 +- packages/rmrk-hooks/CHANGELOG.md | 6 ++++++ packages/rmrk-hooks/package.json | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 .changeset/ten-squids-cheat.md diff --git a/.changeset/ten-squids-cheat.md b/.changeset/ten-squids-cheat.md deleted file mode 100644 index aa8dcb4..0000000 --- a/.changeset/ten-squids-cheat.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@rmrk-team/nft-renderer': patch -'@rmrk-team/rmrk-hooks': patch ---- - -Wait until we have all metadatas before fetching uris diff --git a/packages/nft-renderer/CHANGELOG.md b/packages/nft-renderer/CHANGELOG.md index d995022..1953754 100644 --- a/packages/nft-renderer/CHANGELOG.md +++ b/packages/nft-renderer/CHANGELOG.md @@ -1,5 +1,14 @@ # @rmrk-team/nft-renderer +## 0.1.2 + +### Patch Changes + +- [`eaeabbe`](https://github.com/rmrk-team/rmrk-js/commit/eaeabbebfe0818793fc17d5b381685f4d20bda9c) Thanks [@Yuripetusko](https://github.com/Yuripetusko)! - Wait until we have all metadatas before fetching uris + +- Updated dependencies [[`eaeabbe`](https://github.com/rmrk-team/rmrk-js/commit/eaeabbebfe0818793fc17d5b381685f4d20bda9c)]: + - @rmrk-team/rmrk-hooks@0.1.2 + ## 0.1.1 ### Patch Changes diff --git a/packages/nft-renderer/package.json b/packages/nft-renderer/package.json index 5134ca6..fe445d2 100644 --- a/packages/nft-renderer/package.json +++ b/packages/nft-renderer/package.json @@ -2,7 +2,7 @@ "name": "@rmrk-team/nft-renderer", "description": "React NFT renderer for multi layered composable NFTs built on RMRK standards", "bugs": "https://github.com/rmrk-team/rmrk-js/issues", - "version": "0.1.1", + "version": "0.1.2", "private": false, "access": "public", "repository": { diff --git a/packages/rmrk-hooks/CHANGELOG.md b/packages/rmrk-hooks/CHANGELOG.md index d228304..04e0c61 100644 --- a/packages/rmrk-hooks/CHANGELOG.md +++ b/packages/rmrk-hooks/CHANGELOG.md @@ -1,5 +1,11 @@ # @rmrk-team/rmrk-hooks +## 0.1.2 + +### Patch Changes + +- [`eaeabbe`](https://github.com/rmrk-team/rmrk-js/commit/eaeabbebfe0818793fc17d5b381685f4d20bda9c) Thanks [@Yuripetusko](https://github.com/Yuripetusko)! - Wait until we have all metadatas before fetching uris + ## 0.1.1 ### Patch Changes diff --git a/packages/rmrk-hooks/package.json b/packages/rmrk-hooks/package.json index 9fbb0bb..74f834c 100644 --- a/packages/rmrk-hooks/package.json +++ b/packages/rmrk-hooks/package.json @@ -3,7 +3,7 @@ "description": "React hooks for working with NFTs built on RMRK standards", "bugs": "https://github.com/rmrk-team/rmrk-js/issues", "homepage": "https://github.com/rmrk-team/rmrk-js", - "version": "0.1.1", + "version": "0.1.2", "private": false, "access": "public", "repository": { From 40b162d3e1362823d4fdb411abf403d832ac4f1a Mon Sep 17 00:00:00 2001 From: Yuri Gii Date: Thu, 14 Mar 2024 17:52:36 +0100 Subject: [PATCH 2/7] fix apps conposable-nft-renderer-app --- .../next.config.mjs | 4 + apps/composable-nft-renderer-app/package.json | 3 +- pnpm-lock.yaml | 208 ++++++++++++++++++ 3 files changed, 214 insertions(+), 1 deletion(-) diff --git a/apps/composable-nft-renderer-app/next.config.mjs b/apps/composable-nft-renderer-app/next.config.mjs index 9100595..b3ced2d 100644 --- a/apps/composable-nft-renderer-app/next.config.mjs +++ b/apps/composable-nft-renderer-app/next.config.mjs @@ -3,6 +3,10 @@ */ const nextConfig = { transpilePackages: ['@rmrk-team/nft-renderer', '@rmrk-team/rmrk-evm-utils'], + webpack: (config) => { + config.externals = [...config.externals, { canvas: "canvas" }]; + return config; + }, }; export default nextConfig; diff --git a/apps/composable-nft-renderer-app/package.json b/apps/composable-nft-renderer-app/package.json index 0e4c2a4..5392658 100644 --- a/apps/composable-nft-renderer-app/package.json +++ b/apps/composable-nft-renderer-app/package.json @@ -14,10 +14,11 @@ "@ark-ui/react": "^1.2.1", "@rainbow-me/rainbowkit": "^2.0.0-beta.1", "@rmrk-team/nft-renderer": "workspace:*", + "@rmrk-team/rmrk-2d-renderer": "workspace:*", "@rmrk-team/rmrk-evm-utils": "workspace:*", "@rmrk-team/rmrk-hooks": "workspace:*", - "@rmrk-team/rmrk-2d-renderer": "workspace:*", "@tanstack/react-query": "^5.17.12", + "canvas": "^2.11.2", "lucide-react": "^0.303.0", "next": "13.4.1", "react": "18.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 140edcf..8dad6dc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,6 +86,9 @@ importers: '@tanstack/react-query': specifier: ^5.17.12 version: 5.17.12(react@18.2.0) + canvas: + specifier: ^2.11.2 + version: 2.11.2 lucide-react: specifier: ^0.303.0 version: 0.303.0(react@18.2.0) @@ -3164,6 +3167,24 @@ packages: read-yaml-file: 1.1.0 dev: true + /@mapbox/node-pre-gyp@1.0.11: + resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} + hasBin: true + dependencies: + detect-libc: 2.0.2 + https-proxy-agent: 5.0.1 + make-dir: 3.1.0 + node-fetch: 2.7.0 + nopt: 5.0.0 + npmlog: 5.0.1 + rimraf: 3.0.2 + semver: 7.5.4 + tar: 6.2.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@metamask/eth-json-rpc-provider@1.0.1: resolution: {integrity: sha512-whiUMPlAOrVGmX8aKYVPvlKyG4CpQXiNNyt74vE1xb5sPvmx5oA7B/kOi/JdBvhGQq97U1/AVdXEdk2zkP8qyA==} engines: {node: '>=14.0.0'} @@ -6694,6 +6715,10 @@ packages: resolution: {integrity: sha512-bfEHG+hu4fYT6AGa+yiAl06nXvqIZnR5r3D+S9/vbGyeZhWe2cjNz1eRIOYaVnztCpUdws5GZIF9aB2yG39Y4Q==} dev: true + /abbrev@1.1.1: + resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} + dev: false + /abitype@0.10.3(typescript@5.4.2)(zod@3.22.4): resolution: {integrity: sha512-tRN+7XIa7J9xugdbRzFv/95ka5ivR/sRe01eiWvM0HWWjHuigSZEACgKa0sj4wGuekTDtghCx+5Izk/cOi78pQ==} peerDependencies: @@ -6768,6 +6793,15 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + /agent-base@6.0.2: + resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} + engines: {node: '>= 6.0.0'} + dependencies: + debug: 4.3.4 + transitivePeerDependencies: + - supports-color + dev: false + /agent-base@7.1.0: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} @@ -6844,6 +6878,18 @@ packages: /appdirsjs@1.2.7: resolution: {integrity: sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw==} + /aproba@2.0.0: + resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} + dev: false + + /are-we-there-yet@2.0.0: + resolution: {integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==} + engines: {node: '>=10'} + dependencies: + delegates: 1.0.0 + readable-stream: 3.6.2 + dev: false + /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} dev: true @@ -7268,6 +7314,19 @@ packages: /caniuse-lite@1.0.30001576: resolution: {integrity: sha512-ff5BdakGe2P3SQsMsiqmt1Lc8221NR1VzHj5jXN5vBny9A6fpze94HiVV/n7XRosOlsShJcvMv5mdnpjOGCEgg==} + /canvas@2.11.2: + resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==} + engines: {node: '>=6'} + requiresBuild: true + dependencies: + '@mapbox/node-pre-gyp': 1.0.11 + nan: 2.19.0 + simple-get: 3.1.1 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /chai@4.4.1: resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} engines: {node: '>=4'} @@ -7320,6 +7379,11 @@ packages: optionalDependencies: fsevents: 2.3.3 + /chownr@2.0.0: + resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} + engines: {node: '>=10'} + dev: false + /chrome-launcher@0.15.2: resolution: {integrity: sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ==} engines: {node: '>=12.13.0'} @@ -7447,6 +7511,11 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + /color-support@1.1.3: + resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} + hasBin: true + dev: false + /colorette@1.4.0: resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} @@ -7507,6 +7576,10 @@ packages: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} + /console-control-strings@1.1.0: + resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==} + dev: false + /convert-source-map@1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} @@ -7750,6 +7823,13 @@ packages: resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==} engines: {node: '>=0.10'} + /decompress-response@4.2.1: + resolution: {integrity: sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==} + engines: {node: '>=8'} + dependencies: + mimic-response: 2.1.0 + dev: false + /deep-eql@4.1.3: resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} engines: {node: '>=6'} @@ -7802,6 +7882,10 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} + /delegates@1.0.0: + resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} + dev: false + /denodeify@1.2.1: resolution: {integrity: sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg==} @@ -7851,6 +7935,11 @@ packages: engines: {node: '>=0.10'} hasBin: true + /detect-libc@2.0.2: + resolution: {integrity: sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==} + engines: {node: '>=8'} + dev: false + /detect-node-es@1.1.0: resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==} dev: false @@ -8920,6 +9009,13 @@ packages: universalify: 2.0.1 dev: true + /fs-minipass@2.1.0: + resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.3.6 + dev: false + /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -8951,6 +9047,21 @@ packages: resolution: {integrity: sha512-SewY5KdMpaoCeh7jachEWFsh1nNlaDjNHZXWqL5IGwtpEYHTgkr2+AMCgNwKWkcc0wpSYrZfR7he4WdmHFtDxQ==} engines: {node: '>=8'} + /gauge@3.0.2: + resolution: {integrity: sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==} + engines: {node: '>=10'} + dependencies: + aproba: 2.0.0 + color-support: 1.1.3 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.7 + string-width: 4.2.3 + strip-ansi: 6.0.1 + wide-align: 1.1.5 + dev: false + /gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -9188,6 +9299,10 @@ packages: dependencies: has-symbols: 1.0.3 + /has-unicode@2.0.1: + resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==} + dev: false + /hash.js@1.1.7: resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==} dependencies: @@ -9294,6 +9409,16 @@ packages: resolution: {integrity: sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} + /https-proxy-agent@5.0.1: + resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} + engines: {node: '>= 6'} + dependencies: + agent-base: 6.0.2 + debug: 4.3.4 + transitivePeerDependencies: + - supports-color + dev: false + /https-proxy-agent@7.0.2: resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==} engines: {node: '>= 14'} @@ -10533,6 +10658,13 @@ packages: pify: 4.0.1 semver: 5.7.2 + /make-dir@3.1.0: + resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} + engines: {node: '>=8'} + dependencies: + semver: 6.3.1 + dev: false + /make-dir@4.0.0: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} @@ -10877,6 +11009,11 @@ packages: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} + /mimic-response@2.1.0: + resolution: {integrity: sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==} + engines: {node: '>=8'} + dev: false + /min-indent@1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} @@ -10919,11 +11056,31 @@ packages: /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + /minipass@3.3.6: + resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} + engines: {node: '>=8'} + dependencies: + yallist: 4.0.0 + dev: false + + /minipass@5.0.0: + resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} + engines: {node: '>=8'} + dev: false + /minipass@7.0.4: resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} engines: {node: '>=16 || 14 >=14.17'} dev: true + /minizlib@2.1.2: + resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.3.6 + yallist: 4.0.0 + dev: false + /mipd@0.0.5(typescript@5.4.2)(zod@3.22.4): resolution: {integrity: sha512-gbKA784D2WKb5H/GtqEv+Ofd1S9Zj+Z/PGDIl1u1QAbswkxD28BQ5bSXQxkeBzPBABg1iDSbiwGG1XqlOxRspA==} peerDependencies: @@ -11024,6 +11181,10 @@ packages: engines: {node: '>=12.0.0'} dev: true + /nan@2.19.0: + resolution: {integrity: sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==} + dev: false + /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -11179,6 +11340,14 @@ packages: readable-stream: 1.0.34 dev: true + /nopt@5.0.0: + resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} + engines: {node: '>=6'} + hasBin: true + dependencies: + abbrev: 1.1.1 + dev: false + /normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: @@ -11230,6 +11399,15 @@ packages: dependencies: path-key: 4.0.0 + /npmlog@5.0.1: + resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==} + dependencies: + are-we-there-yet: 2.0.0 + console-control-strings: 1.1.0 + gauge: 3.0.2 + set-blocking: 2.0.0 + dev: false + /nullthrows@1.1.1: resolution: {integrity: sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==} @@ -12715,6 +12893,18 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} + /simple-concat@1.0.1: + resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==} + dev: false + + /simple-get@3.1.1: + resolution: {integrity: sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==} + dependencies: + decompress-response: 4.2.1 + once: 1.4.0 + simple-concat: 1.0.1 + dev: false + /simple-git-hooks@2.9.0: resolution: {integrity: sha512-waSQ5paUQtyGC0ZxlHmcMmD9I1rRXauikBwX31bX58l5vTOhCEcBC5Bi+ZDkPXTjDnZAF8TbCqKBY+9+sVPScw==} hasBin: true @@ -13101,6 +13291,18 @@ packages: engines: {node: '>=6'} dev: true + /tar@6.2.0: + resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} + engines: {node: '>=10'} + dependencies: + chownr: 2.0.0 + fs-minipass: 2.1.0 + minipass: 5.0.0 + minizlib: 2.1.2 + mkdirp: 1.0.4 + yallist: 4.0.0 + dev: false + /temp-dir@2.0.0: resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==} engines: {node: '>=8'} @@ -14190,6 +14392,12 @@ packages: stackback: 0.0.2 dev: true + /wide-align@1.1.5: + resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} + dependencies: + string-width: 4.2.3 + dev: false + /wrap-ansi@6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} engines: {node: '>=8'} From a6eae53e3772d9ac852671c47d6e67896cb0d515 Mon Sep 17 00:00:00 2001 From: Yuri Gii Date: Thu, 14 Mar 2024 17:52:55 +0100 Subject: [PATCH 3/7] next config edit --- apps/composable-nft-renderer-app/next.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/composable-nft-renderer-app/next.config.mjs b/apps/composable-nft-renderer-app/next.config.mjs index b3ced2d..fadd91f 100644 --- a/apps/composable-nft-renderer-app/next.config.mjs +++ b/apps/composable-nft-renderer-app/next.config.mjs @@ -4,7 +4,7 @@ const nextConfig = { transpilePackages: ['@rmrk-team/nft-renderer', '@rmrk-team/rmrk-evm-utils'], webpack: (config) => { - config.externals = [...config.externals, { canvas: "canvas" }]; + config.externals = [...config.externals, { canvas: 'canvas' }]; return config; }, }; From 2f070851e5fc7f0996af37f17911785275d3376e Mon Sep 17 00:00:00 2001 From: Yuri Gii Date: Thu, 14 Mar 2024 18:43:06 +0100 Subject: [PATCH 4/7] return equipped slot items data --- .../src/lib/hooks/use-get-composed-state.ts | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts b/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts index f2d0eb7..3bef3fe 100644 --- a/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts +++ b/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts @@ -81,13 +81,8 @@ export const useGetComposedState = ( query: { enabled: enabled && !!assetIdToUse }, }); - const [ - assetMetadataUri, - equippableGroupId, - catalogAddress, - fixedParts, - slotParts, - ] = equippableDataResponse || []; + const [assetMetadataUri, equippableGroupId, catalogAddress, fixedParts, slotParts] = + equippableDataResponse || []; const fixedMetadataUris = fixedParts?.map((p) => p.metadataURI); @@ -104,9 +99,7 @@ export const useGetComposedState = ( fixedParts?.map((p) => ({ z: p.z })), ); - const slotMetadataUris = slotParts?.map( - (p) => p.childAssetMetadata || p.partMetadata, - ); + const slotMetadataUris = slotParts?.map((p) => p.childAssetMetadata || p.partMetadata); const { isLoading: isLoadingSlotPartsMetadatas, @@ -124,7 +117,13 @@ export const useGetComposedState = ( return { data: { fixedPartsWithMetadatas, - slotPartsWithMetadatas, + slotPartsWithMetadatas: + !!slotPartsWithMetadatas && !!slotParts + ? slotPartsWithMetadatas.map((partWithMetadata) => ({ + ...partWithMetadata, + ...slotParts.find((part) => part.z === partWithMetadata.z), + })) + : undefined, assetMetadataUri, equippableGroupId, catalogAddress, From bed59f3c18f5513798faeb54d19fde625a387c07 Mon Sep 17 00:00:00 2001 From: Yuri Gii Date: Thu, 14 Mar 2024 18:43:37 +0100 Subject: [PATCH 5/7] formatting --- .../src/lib/hooks/use-get-composed-state.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts b/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts index 3bef3fe..15e93f3 100644 --- a/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts +++ b/packages/rmrk-hooks/src/lib/hooks/use-get-composed-state.ts @@ -81,8 +81,13 @@ export const useGetComposedState = ( query: { enabled: enabled && !!assetIdToUse }, }); - const [assetMetadataUri, equippableGroupId, catalogAddress, fixedParts, slotParts] = - equippableDataResponse || []; + const [ + assetMetadataUri, + equippableGroupId, + catalogAddress, + fixedParts, + slotParts, + ] = equippableDataResponse || []; const fixedMetadataUris = fixedParts?.map((p) => p.metadataURI); @@ -99,7 +104,9 @@ export const useGetComposedState = ( fixedParts?.map((p) => ({ z: p.z })), ); - const slotMetadataUris = slotParts?.map((p) => p.childAssetMetadata || p.partMetadata); + const slotMetadataUris = slotParts?.map( + (p) => p.childAssetMetadata || p.partMetadata, + ); const { isLoading: isLoadingSlotPartsMetadatas, From 325e6e2bec733177cbe86e966ffc821603653bb2 Mon Sep 17 00:00:00 2001 From: Yuri Gii Date: Thu, 14 Mar 2024 18:59:12 +0100 Subject: [PATCH 6/7] release update to nft-renderer and rmrk-hooks --- .changeset/long-tips-whisper.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/long-tips-whisper.md diff --git a/.changeset/long-tips-whisper.md b/.changeset/long-tips-whisper.md new file mode 100644 index 0000000..f849324 --- /dev/null +++ b/.changeset/long-tips-whisper.md @@ -0,0 +1,6 @@ +--- +'@rmrk-team/nft-renderer': minor +'@rmrk-team/rmrk-hooks': minor +--- + +fix nft-renderer config and add equipped item details to useGetComposedState From 64868e0577fd74559cd68e9bf016e4534c9872d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 14 Mar 2024 18:01:35 +0000 Subject: [PATCH 7/7] chore: version packages --- .changeset/long-tips-whisper.md | 6 ------ packages/nft-renderer/CHANGELOG.md | 11 +++++++++++ packages/nft-renderer/package.json | 2 +- packages/rmrk-hooks/CHANGELOG.md | 6 ++++++ packages/rmrk-hooks/package.json | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 .changeset/long-tips-whisper.md diff --git a/.changeset/long-tips-whisper.md b/.changeset/long-tips-whisper.md deleted file mode 100644 index f849324..0000000 --- a/.changeset/long-tips-whisper.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@rmrk-team/nft-renderer': minor -'@rmrk-team/rmrk-hooks': minor ---- - -fix nft-renderer config and add equipped item details to useGetComposedState diff --git a/packages/nft-renderer/CHANGELOG.md b/packages/nft-renderer/CHANGELOG.md index 1953754..8cd1989 100644 --- a/packages/nft-renderer/CHANGELOG.md +++ b/packages/nft-renderer/CHANGELOG.md @@ -1,5 +1,16 @@ # @rmrk-team/nft-renderer +## 0.2.0 + +### Minor Changes + +- [`325e6e2`](https://github.com/rmrk-team/rmrk-js/commit/325e6e2bec733177cbe86e966ffc821603653bb2) Thanks [@YuriGii](https://github.com/YuriGii)! - fix nft-renderer config and add equipped item details to useGetComposedState + +### Patch Changes + +- Updated dependencies [[`325e6e2`](https://github.com/rmrk-team/rmrk-js/commit/325e6e2bec733177cbe86e966ffc821603653bb2)]: + - @rmrk-team/rmrk-hooks@0.2.0 + ## 0.1.2 ### Patch Changes diff --git a/packages/nft-renderer/package.json b/packages/nft-renderer/package.json index fe445d2..ee61644 100644 --- a/packages/nft-renderer/package.json +++ b/packages/nft-renderer/package.json @@ -2,7 +2,7 @@ "name": "@rmrk-team/nft-renderer", "description": "React NFT renderer for multi layered composable NFTs built on RMRK standards", "bugs": "https://github.com/rmrk-team/rmrk-js/issues", - "version": "0.1.2", + "version": "0.2.0", "private": false, "access": "public", "repository": { diff --git a/packages/rmrk-hooks/CHANGELOG.md b/packages/rmrk-hooks/CHANGELOG.md index 04e0c61..abde698 100644 --- a/packages/rmrk-hooks/CHANGELOG.md +++ b/packages/rmrk-hooks/CHANGELOG.md @@ -1,5 +1,11 @@ # @rmrk-team/rmrk-hooks +## 0.2.0 + +### Minor Changes + +- [`325e6e2`](https://github.com/rmrk-team/rmrk-js/commit/325e6e2bec733177cbe86e966ffc821603653bb2) Thanks [@YuriGii](https://github.com/YuriGii)! - fix nft-renderer config and add equipped item details to useGetComposedState + ## 0.1.2 ### Patch Changes diff --git a/packages/rmrk-hooks/package.json b/packages/rmrk-hooks/package.json index 74f834c..ef73638 100644 --- a/packages/rmrk-hooks/package.json +++ b/packages/rmrk-hooks/package.json @@ -3,7 +3,7 @@ "description": "React hooks for working with NFTs built on RMRK standards", "bugs": "https://github.com/rmrk-team/rmrk-js/issues", "homepage": "https://github.com/rmrk-team/rmrk-js", - "version": "0.1.2", + "version": "0.2.0", "private": false, "access": "public", "repository": {