From 9cac4d3aba531e2ca6e611dbfbe82a3446fc1812 Mon Sep 17 00:00:00 2001 From: Mathieu Hofman Date: Tue, 1 Feb 2022 20:51:58 +0000 Subject: [PATCH] fix: allow ui to build against newest linked sdk Take on explicit @endo/marshal and @endo/captp dependency to satisfy parcel Reorganize some dependencies between dev and prod --- api/package.json | 1 - contract/package.json | 1 - package.json | 4 +-- ui/package.json | 19 ++++++----- yarn.lock | 76 +++++++++++++++++++++++++++++++++++-------- 5 files changed, 74 insertions(+), 27 deletions(-) diff --git a/api/package.json b/api/package.json index c384abe..3322b9d 100644 --- a/api/package.json +++ b/api/package.json @@ -14,7 +14,6 @@ "lint-check-jessie": "eslint -c '.eslintrc-jessie.js' '**/*.{js,jsx}'" }, "devDependencies": { - "agoric": "*", "eslint": "^7.23.0", "eslint-config-airbnb-base": "^14.0.0", "eslint-config-jessie": "^0.0.6", diff --git a/contract/package.json b/contract/package.json index ddddf52..fbe964e 100644 --- a/contract/package.json +++ b/contract/package.json @@ -14,7 +14,6 @@ "lint-check-jessie": "eslint -c '.eslintrc-jessie.js' '**/*.{js,jsx}'" }, "devDependencies": { - "agoric": "*", "eslint": "^7.23.0", "eslint-config-airbnb-base": "^14.0.0", "eslint-config-jessie": "^0.0.6", diff --git a/package.json b/package.json index c46cb88..36a661b 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "eslint-config-airbnb-base": "^14.0.0", "eslint-config-jessie": "^0.0.6", "eslint-config-prettier": "^6.12.0", + "eslint-plugin-eslint-comments": "^3.1.2", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-prettier": "^3.1.2", @@ -34,8 +35,7 @@ "build": "yarn workspaces run build" }, "dependencies": { - "agoric": "*", - "eslint-plugin-eslint-comments": "^3.1.2" + "agoric": "*" }, "ava": { "files": [ diff --git a/ui/package.json b/ui/package.json index 44e8d0b..9d4826e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -44,14 +44,15 @@ "watcherGlob": "**/*.html" }, "dependencies": { - "parcel-bundler": "^1.12.4", - "parcel-plugin-static-files-copy": "^2.5.0", - "regenerator-runtime": "0.13.7" + "@agoric/notifier": "^0.3.33", + "@agoric/wallet-connection": "^0.1.4", + "@endo/captp": "1.10.12", + "@endo/marshal": "^0.5.4", + "lit": "^2.0.2", + "regenerator-runtime": "0.13.7", + "ses": "^0.15.7" }, "devDependencies": { - "@agoric/notifier": "^0.3.32", - "@agoric/wallet-connection": "^0.1.2", - "agoric": "*", "caniuse-lite": "1.0.30001251", "eslint": "^7.23.0", "eslint-config-airbnb": "^18.2.0", @@ -62,10 +63,10 @@ "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-react": "^7.21.4", "eslint-plugin-react-hooks": "^4.1.2", - "lit": "^2.0.2", + "parcel-bundler": "^1.12.4", + "parcel-plugin-static-files-copy": "^2.5.0", "prettier": "^2.1.2", - "rimraf": "^3.0.2", - "ses": "^0.14.2" + "rimraf": "^3.0.2" }, "prettier": { "trailingComma": "all", diff --git a/yarn.lock b/yarn.lock index 11f969c..385b23b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -76,10 +76,10 @@ rollup "^1.32.0" source-map "^0.7.3" -"@agoric/captp@^1.10.7": - version "1.10.7" - resolved "https://registry.yarnpkg.com/@agoric/captp/-/captp-1.10.7.tgz#ec55ba550f21886fcf9a1eeb6abebecbdedf6dfc" - integrity sha512-fJirXSIR+OOp97wpaJ6LXS/E5mmFSoQypPQeKdYdERV8wQsY7bSjDMa2mfbqVKNDZ+txAzVvVXieASYet+GaUg== +"@agoric/captp@^1.10.8": + version "1.10.8" + resolved "https://registry.yarnpkg.com/@agoric/captp/-/captp-1.10.8.tgz#c823f4edbe4c3acd80b6cfd87dbb42a5bf463138" + integrity sha512-eBW1ctzRpwhj+oIKgG4uo9HhFcB+RltUFf7cfiOEz+8ZV+/A4ZSjSe0uUYt/Fm9FBqGW0XclhqWIPWEBt4jggQ== dependencies: "@agoric/assert" "^0.3.15" "@agoric/eventual-send" "^0.14.0" @@ -282,10 +282,10 @@ "@agoric/eventual-send" "^0.11.1" "@agoric/promise-kit" "^0.1.6" -"@agoric/notifier@^0.3.32": - version "0.3.32" - resolved "https://registry.yarnpkg.com/@agoric/notifier/-/notifier-0.3.32.tgz#62be82f43564ec3ab986e6ea1c7d2021adbb5d51" - integrity sha512-Z/1Azmis9V7pxSlMBCuJE7fXA0zXLc30S0tkJShp9WpyX0wZduLh6eeBqF1HS1JwE793BawIY1nvRNvGpJkr8Q== +"@agoric/notifier@^0.3.33": + version "0.3.33" + resolved "https://registry.yarnpkg.com/@agoric/notifier/-/notifier-0.3.33.tgz#28476cef31bffa4ed5a33fe66660617c8c527d77" + integrity sha512-PtGyigl9KY4NVmXK3Yjcev2JI4SbGBhz+rbtESNhf9BJh1p6TZ+8NGrPxZwA1qqvBY8E4/fSRqizl1WFgRG/Wg== dependencies: "@agoric/assert" "^0.3.15" "@agoric/eventual-send" "^0.14.0" @@ -439,13 +439,20 @@ resolved "https://registry.yarnpkg.com/@agoric/transform-module/-/transform-module-0.4.1.tgz#9fb152364faf372e1bda535cb4ef89717724f57c" integrity sha512-4TJJHXeXAWu1FCA7yXCAZmhBNoGTB/BEAe2pv+J2X8W/mJTr9b395OkDCSRMpzvmSshLfBx6wT0D7dqWIWEC1w== -"@agoric/wallet-connection@^0.1.2": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@agoric/wallet-connection/-/wallet-connection-0.1.2.tgz#b306eea3a9af460b26cc9ec314a5d11e46af1d8d" - integrity sha512-jxserbswPmv7YYnHdeIdemlR44pA1SsqVkdOKVGkINF+GWWmqDSoWtfKmHkdc3DQ/avcjQWUq91lha7GVYClcA== +"@agoric/wallet-connection@^0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@agoric/wallet-connection/-/wallet-connection-0.1.4.tgz#0abf8599ad32128cc7a1062bfb03cf033baac1ce" + integrity sha512-v9i02Jh5dpX96SCQ9SRibQ97wZgMXKeln/HmoJNaKnSMtVy4VVOxoBbBFu8Rh0pCf9+1vPiAu5SR4n6kxOrK6Q== + dependencies: + "@agoric/web-components" "^0.1.3" + +"@agoric/web-components@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@agoric/web-components/-/web-components-0.1.3.tgz#bb3269f856b1c9aa56253c5d9aef80b452764eff" + integrity sha512-Okz6NOfokhX0Pgd+zbMpuBbcvyUTaV0x7mJsp6OG1EbssxgFHlra6G7uTIvN2UKlvibgjruksYpRvq8o7OgpOg== dependencies: "@agoric/assert" "^0.3.15" - "@agoric/captp" "^1.10.7" + "@agoric/captp" "^1.10.8" "@agoric/marshal" "^0.5.0" "@agoric/promise-kit" "^0.2.29" robot3 "^0.2.19" @@ -1387,6 +1394,16 @@ resolved "https://registry.yarnpkg.com/@endo/base64/-/base64-0.1.0.tgz#d321d5b36f16648f0b0b05d96f93501d6a461501" integrity sha512-wVBsKkVV3t3mGT1XVoQAYkBpnum/OEJ0kBka3s7PSQnAne0aFmi1P9IIWyHzsoIgdai7ONTpGSgBZIk6X9dOrw== +"@endo/captp@1.10.12": + version "1.10.12" + resolved "https://registry.yarnpkg.com/@endo/captp/-/captp-1.10.12.tgz#69ce23a49ecfdf0bad84f931a55df797d2cfd0ed" + integrity sha512-tdughHAu1V8+NyXikrEXJfyyq/+CIcsAx9dQ3ZWf34c7gYJPSQtaDFCheDmNwDoVBn1SMGg+8cVjSmbJe8pWtw== + dependencies: + "@endo/eventual-send" "^0.14.4" + "@endo/marshal" "^0.5.4" + "@endo/nat" "^4.1.4" + "@endo/promise-kit" "^0.2.33" + "@endo/eslint-plugin@^0.3.10": version "0.3.10" resolved "https://registry.yarnpkg.com/@endo/eslint-plugin/-/eslint-plugin-0.3.10.tgz#e51f4ef8dae474d396b6a98a9ea9bbc983e90c57" @@ -1394,6 +1411,32 @@ dependencies: requireindex "~1.1.0" +"@endo/eventual-send@^0.14.4": + version "0.14.4" + resolved "https://registry.yarnpkg.com/@endo/eventual-send/-/eventual-send-0.14.4.tgz#40f2c7fd64d66e1ed5eaf15a90d6d689af13eb36" + integrity sha512-1MSnq7bcCustCIKB7TJ1cfCg7A0W/LmX9bxhIV1syG7TO3mgV1DX7YceU0Ek+JDlqR3x9cM12WeaXfM+1ggfKg== + +"@endo/marshal@^0.5.4": + version "0.5.4" + resolved "https://registry.yarnpkg.com/@endo/marshal/-/marshal-0.5.4.tgz#3e96a421afe56846086fcee569be41f80e7e2ec5" + integrity sha512-ojcScWANmoiWfFH7iRUak+QOviXVS6Ubznj3fzXPizszjX8/M/67/XSbzbRdLYlevChzEtP60xhbYZPxzJSHRw== + dependencies: + "@endo/eventual-send" "^0.14.4" + "@endo/nat" "^4.1.4" + "@endo/promise-kit" "^0.2.33" + +"@endo/nat@^4.1.4": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@endo/nat/-/nat-4.1.4.tgz#7e9c45817b6ddb0332a115600b6e52d500efe9c7" + integrity sha512-HfgDO3JJNKxE597v8dg0o2wVYCSmfVVF2dhza/i+j8o28gUyxZxrRlxpDWaCT44o3XpIQSepfePrqjyLGkfEcQ== + +"@endo/promise-kit@^0.2.33": + version "0.2.33" + resolved "https://registry.yarnpkg.com/@endo/promise-kit/-/promise-kit-0.2.33.tgz#dd5f8d810fef6e1370ff7dfe2d95d884961840c5" + integrity sha512-Bxt3jRB9iN7WOwiVxV2FmfBX2BfK3ffkcEhsxhnMBS8PEqVJ6M/Y+K2nV/b8v18/N7U5RA8UHY6IdRxyKjQ5Jw== + dependencies: + ses "^0.15.7" + "@eslint/eslintrc@^0.4.0": version "0.4.0" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" @@ -7708,11 +7751,16 @@ ses@^0.12.6: "@agoric/make-hardener" "^0.1.2" "@agoric/transform-module" "^0.4.1" -ses@^0.14.1, ses@^0.14.2: +ses@^0.14.1: version "0.14.2" resolved "https://registry.yarnpkg.com/ses/-/ses-0.14.2.tgz#3dd62c1779cc9ee5df506d7b1a40fe514ba541e1" integrity sha512-RKAOt8KxkJJyclwfd0mQ6GtmIyYUOrDew7DwKM6DTWY8f9u1eDJccpHXvxDhpXDcWlJ40dtC/FCx12BFZuGPng== +ses@^0.15.7: + version "0.15.7" + resolved "https://registry.yarnpkg.com/ses/-/ses-0.15.7.tgz#53da049638bb34941befd1eccf34647c950f91a2" + integrity sha512-WqEanVAU/zMSoR/c/bHrAHTD7wMPm4zQrVCSXuzHxuvq4mM0xdrK/rEgQ35zQh7IyIg2n/aKDJWv3CL1quiJFA== + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"