From 9f2de3d7f47b180c1e23a2f69d9e4cf1e37706bb Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 11:20:58 -0600 Subject: [PATCH 1/8] update arcana package and yarn --- packages/arcana-auth/package.json | 3 ++- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/arcana-auth/package.json b/packages/arcana-auth/package.json index a08d207a0..2994d19de 100644 --- a/packages/arcana-auth/package.json +++ b/packages/arcana-auth/package.json @@ -13,7 +13,8 @@ "type-check": "tsc --noEmit" }, "dependencies": { - "@arcana/auth": "^1.0.6" + "@arcana/auth": "^1.0.6", + "@web3-onboard/common": "2.3.3" }, "devDependencies": { "typescript": "^5.1.6" diff --git a/yarn.lock b/yarn.lock index ef7fb13e5..368ef6b3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -154,10 +154,10 @@ resolved "https://registry.yarnpkg.com/@apocentre/alias-sampling/-/alias-sampling-0.5.3.tgz#897ff181b48ad7b2bcb4ecf29400214888244f08" integrity sha512-7UDWIIF9hIeJqfKXkNIzkVandlwLf1FWTSdrb9iXvOP8oF544JRXQjCbiTmCv2c9n44n/FIWtehhBfNuAx2CZA== -"@arcana/auth@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@arcana/auth/-/auth-1.0.3.tgz#10008e95e9c43b5bafaf9a35ae8261c028975619" - integrity sha512-Ab6UoxqlsruzWZ3XPBL8jdfrW2GmU7F4dec7Qic/L6jePQTxjOkSkXqrTnZ8Zo4Ew3A/6r6j/8HcjbgFAyBoBQ== +"@arcana/auth@^1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@arcana/auth/-/auth-1.0.6.tgz#6b84a37e600b56c54651634debc11c8a01d3e129" + integrity sha512-wJ/qP6bZcJR/U3YUtGWNF359grRjPoILrRYn4jix7zlguhY34Yc27NFhsDwq7yrgnPQYa4lLz6uOZf0pDOHbgA== dependencies: "@metamask/safe-event-emitter" "^2.0.0" eth-rpc-errors "^4.0.3" @@ -12159,10 +12159,10 @@ typescript@^4.6.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9" integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg== -typescript@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.4.tgz#b217fd20119bd61a94d4011274e0ab369058da3b" - integrity sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw== +typescript@^5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274" + integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA== uint8arrays@^3.0.0, uint8arrays@^3.1.0: version "3.1.1" From ccd5701de16440effab71f3939b94f672717f616 Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 11:27:30 -0600 Subject: [PATCH 2/8] fix spacing in config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1eabe17ca..8e77be428 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -904,7 +904,7 @@ workflows: - build-blocto: <<: *deploy_production_filters - build-staging-blocto: - <<: *deploy_staging_filters + <<: *deploy_staging_filters venly: jobs: - build-venly: From 24ee50675728964127be3d80cf56d02f62a42213 Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 11:47:26 -0600 Subject: [PATCH 3/8] try update spacing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e77be428..6916045b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -898,7 +898,7 @@ workflows: - build-arcana-auth: <<: *deploy_production_filters - build-staging-arcana-auth: - <<: *deploy_staging_filters + <<: *deploy_staging_filters blocto: jobs: - build-blocto: From 5eb524fe501e43b29fa012ea70609503c7f7c08d Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 11:51:29 -0600 Subject: [PATCH 4/8] reset spacing on config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6916045b9..8e77be428 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -898,7 +898,7 @@ workflows: - build-arcana-auth: <<: *deploy_production_filters - build-staging-arcana-auth: - <<: *deploy_staging_filters + <<: *deploy_staging_filters blocto: jobs: - build-blocto: From e54dc3dbae94ee78f22926770e5db1dd042142f5 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 2 Aug 2023 12:01:30 -0600 Subject: [PATCH 5/8] update ci branch for test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e77be428..bc1b3a662 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ aliases: - &deploy_staging_filters filters: branches: - only: develop + only: arcana-build-fix - &test_package_version_for_alpha_tag_break_false run: From f2286c518ff4d803dcdcb3abdfc10fed83fe2e31 Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 12:11:20 -0600 Subject: [PATCH 6/8] add ts-ignore --- packages/arcana-auth/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/arcana-auth/src/index.ts b/packages/arcana-auth/src/index.ts index a37c48536..03c45bb84 100644 --- a/packages/arcana-auth/src/index.ts +++ b/packages/arcana-auth/src/index.ts @@ -17,6 +17,7 @@ export default function (opts: { const instance = new AuthProvider(opts.clientID, opts.params) await instance.init() return new Promise((resolve, reject) => { + // @ts-ignore instance.provider.once('connect', () => { resolve({ provider: createEIP1193Provider(instance.provider), From d2a43073471ffa4e2c394188e3531901060e81aa Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 12:13:08 -0600 Subject: [PATCH 7/8] reset config to develop --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc1b3a662..8e77be428 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ aliases: - &deploy_staging_filters filters: branches: - only: arcana-build-fix + only: develop - &test_package_version_for_alpha_tag_break_false run: From 146f12ff1ccaf2138657c3e3b4289d8e0ea8a4f1 Mon Sep 17 00:00:00 2001 From: Kat Leight Date: Wed, 2 Aug 2023 12:20:52 -0600 Subject: [PATCH 8/8] add file extension to icon --- packages/arcana-auth/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/arcana-auth/src/index.ts b/packages/arcana-auth/src/index.ts index 03c45bb84..57be577fd 100644 --- a/packages/arcana-auth/src/index.ts +++ b/packages/arcana-auth/src/index.ts @@ -1,5 +1,5 @@ import { createEIP1193Provider, WalletInit } from '@web3-onboard/common' -import icon from './icon' +import icon from './icon.js' import type { ConstructorParams } from '@arcana/auth/types' export default function (opts: {