diff --git a/.github/workflows/connect-test-local.yml b/.github/workflows/connect-test-local.yml index dcc7ad92..43816626 100644 --- a/.github/workflows/connect-test-local.yml +++ b/.github/workflows/connect-test-local.yml @@ -60,7 +60,7 @@ jobs: - name: test base local run: | pnpm test:ci - working-directory: ./sdk/apps/base + working-directory: ./sdk/packages/base - name: test solana local run: | pnpm test:ci diff --git a/.github/workflows/connect-test-production.yml b/.github/workflows/connect-test-production.yml index c54eca2d..e64c2025 100644 --- a/.github/workflows/connect-test-production.yml +++ b/.github/workflows/connect-test-production.yml @@ -35,7 +35,7 @@ jobs: - name: test base production run: | pnpm test:production - working-directory: ./sdk/apps/base + working-directory: ./sdk/packages/base - name: test solana production run: | pnpm test:production diff --git a/sdk/build-only-packages.sh b/sdk/build-only-packages.sh index c1326765..5c876ff4 100644 --- a/sdk/build-only-packages.sh +++ b/sdk/build-only-packages.sh @@ -1,9 +1,9 @@ # connect base -cd ./apps/base +cd ./packages/base pnpm build # connect networks -cd ../../packages/solana +cd ../solana pnpm build cd ../sui pnpm build diff --git a/sdk/packages/aptos/package.json b/sdk/packages/aptos/package.json index e73144d8..d8dc8a8e 100644 --- a/sdk/packages/aptos/package.json +++ b/sdk/packages/aptos/package.json @@ -45,7 +45,7 @@ "dependencies": { "@aptos-labs/ts-sdk": "^1.9.1", "@aptos-labs/wallet-standard": "^0.0.11", - "@nightlylabs/nightly-connect-base": "^0.0.27", + "@nightlylabs/nightly-connect-base": "^0.0.28", "eventemitter3": "^5.0.1" } -} \ No newline at end of file +} diff --git a/sdk/apps/base/.gitignore b/sdk/packages/base/.gitignore similarity index 100% rename from sdk/apps/base/.gitignore rename to sdk/packages/base/.gitignore diff --git a/sdk/apps/base/package.json b/sdk/packages/base/package.json similarity index 98% rename from sdk/apps/base/package.json rename to sdk/packages/base/package.json index df810f69..df027426 100644 --- a/sdk/apps/base/package.json +++ b/sdk/packages/base/package.json @@ -1,6 +1,6 @@ { "name": "@nightlylabs/nightly-connect-base", - "version": "0.0.27", + "version": "0.0.28", "type": "module", "exports": { ".": { diff --git a/sdk/apps/base/rollup.config.js b/sdk/packages/base/rollup.config.js similarity index 96% rename from sdk/apps/base/rollup.config.js rename to sdk/packages/base/rollup.config.js index eb00e9e4..67ea36c9 100644 --- a/sdk/apps/base/rollup.config.js +++ b/sdk/packages/base/rollup.config.js @@ -61,7 +61,7 @@ export default [ ] }, { - input: 'dist/types/apps/base/src/index.d.ts', + input: 'dist/types/packages/base/src/index.d.ts', output: [{ file: 'dist/index.d.ts', format: 'esm' }], plugins: [dts()] } diff --git a/sdk/apps/base/src/app.test.ts b/sdk/packages/base/src/app.test.ts similarity index 100% rename from sdk/apps/base/src/app.test.ts rename to sdk/packages/base/src/app.test.ts diff --git a/sdk/apps/base/src/app.ts b/sdk/packages/base/src/app.ts similarity index 100% rename from sdk/apps/base/src/app.ts rename to sdk/packages/base/src/app.ts diff --git a/sdk/apps/base/src/client.test.ts b/sdk/packages/base/src/client.test.ts similarity index 100% rename from sdk/apps/base/src/client.test.ts rename to sdk/packages/base/src/client.test.ts diff --git a/sdk/apps/base/src/client.ts b/sdk/packages/base/src/client.ts similarity index 100% rename from sdk/apps/base/src/client.ts rename to sdk/packages/base/src/client.ts diff --git a/sdk/apps/base/src/content.ts b/sdk/packages/base/src/content.ts similarity index 100% rename from sdk/apps/base/src/content.ts rename to sdk/packages/base/src/content.ts diff --git a/sdk/apps/base/src/deeplink.test.ts b/sdk/packages/base/src/deeplink.test.ts similarity index 100% rename from sdk/apps/base/src/deeplink.test.ts rename to sdk/packages/base/src/deeplink.test.ts diff --git a/sdk/apps/base/src/deeplinks.ts b/sdk/packages/base/src/deeplinks.ts similarity index 100% rename from sdk/apps/base/src/deeplinks.ts rename to sdk/packages/base/src/deeplinks.ts diff --git a/sdk/apps/base/src/http-client.test.ts b/sdk/packages/base/src/http-client.test.ts similarity index 100% rename from sdk/apps/base/src/http-client.test.ts rename to sdk/packages/base/src/http-client.test.ts diff --git a/sdk/apps/base/src/http-client.ts b/sdk/packages/base/src/http-client.ts similarity index 100% rename from sdk/apps/base/src/http-client.ts rename to sdk/packages/base/src/http-client.ts diff --git a/sdk/apps/base/src/index.ts b/sdk/packages/base/src/index.ts similarity index 100% rename from sdk/apps/base/src/index.ts rename to sdk/packages/base/src/index.ts diff --git a/sdk/apps/base/src/initializeTypes.ts b/sdk/packages/base/src/initializeTypes.ts similarity index 100% rename from sdk/apps/base/src/initializeTypes.ts rename to sdk/packages/base/src/initializeTypes.ts diff --git a/sdk/apps/base/src/multiple-app.test.ts b/sdk/packages/base/src/multiple-app.test.ts similarity index 100% rename from sdk/apps/base/src/multiple-app.test.ts rename to sdk/packages/base/src/multiple-app.test.ts diff --git a/sdk/apps/base/src/persist-app.test.ts b/sdk/packages/base/src/persist-app.test.ts similarity index 100% rename from sdk/apps/base/src/persist-app.test.ts rename to sdk/packages/base/src/persist-app.test.ts diff --git a/sdk/apps/base/src/responseContent.ts b/sdk/packages/base/src/responseContent.ts similarity index 100% rename from sdk/apps/base/src/responseContent.ts rename to sdk/packages/base/src/responseContent.ts diff --git a/sdk/apps/base/src/testUtils.ts b/sdk/packages/base/src/testUtils.ts similarity index 100% rename from sdk/apps/base/src/testUtils.ts rename to sdk/packages/base/src/testUtils.ts diff --git a/sdk/apps/base/src/utils.ts b/sdk/packages/base/src/utils.ts similarity index 100% rename from sdk/apps/base/src/utils.ts rename to sdk/packages/base/src/utils.ts diff --git a/sdk/apps/base/tsconfig.json b/sdk/packages/base/tsconfig.json similarity index 100% rename from sdk/apps/base/tsconfig.json rename to sdk/packages/base/tsconfig.json diff --git a/sdk/apps/base/vitest.config.ts b/sdk/packages/base/vitest.config.ts similarity index 100% rename from sdk/apps/base/vitest.config.ts rename to sdk/packages/base/vitest.config.ts diff --git a/sdk/packages/polkadot/package.json b/sdk/packages/polkadot/package.json index 2ab1de15..b9219ab4 100644 --- a/sdk/packages/polkadot/package.json +++ b/sdk/packages/polkadot/package.json @@ -46,7 +46,7 @@ "@polkadot/keyring": "^12.5.1" }, "dependencies": { - "@nightlylabs/nightly-connect-base": "0.0.27", + "@nightlylabs/nightly-connect-base": "0.0.28", "@polkadot/api": "^10.10.1", "@polkadot/types": "^10.10.1", "@polkadot/util": "^12.5.1", @@ -55,4 +55,4 @@ "eventemitter3": "^5.0.1", "uuid": "^9.0.0" } -} \ No newline at end of file +} diff --git a/sdk/packages/selector-base/package.json b/sdk/packages/selector-base/package.json index 9dfb8f4d..e53c51b9 100644 --- a/sdk/packages/selector-base/package.json +++ b/sdk/packages/selector-base/package.json @@ -24,7 +24,7 @@ "author": "", "license": "ISC", "dependencies": { - "@nightlylabs/nightly-connect-base": "0.0.27", + "@nightlylabs/nightly-connect-base": "0.0.28", "@nightlylabs/wallet-selector-modal": "0.2.1", "@wallet-standard/core": "^1.0.3", "isomorphic-localstorage": "^1.0.2" diff --git a/sdk/packages/solana/package.json b/sdk/packages/solana/package.json index 3967e236..5ffd5cdf 100644 --- a/sdk/packages/solana/package.json +++ b/sdk/packages/solana/package.json @@ -45,7 +45,7 @@ "typescript": "^5.1.3" }, "dependencies": { - "@nightlylabs/nightly-connect-base": "0.0.27", + "@nightlylabs/nightly-connect-base": "0.0.28", "@solana/web3.js": "^1.77.2", "eventemitter3": "^5.0.1", "uuid": "^9.0.0" diff --git a/sdk/packages/sui/package.json b/sdk/packages/sui/package.json index af552747..ac50829f 100644 --- a/sdk/packages/sui/package.json +++ b/sdk/packages/sui/package.json @@ -48,7 +48,7 @@ "dependencies": { "@mysten/sui.js": "^0.42.0", "@mysten/wallet-standard": "^0.8.0", - "@nightlylabs/nightly-connect-base": "^0.0.27", + "@nightlylabs/nightly-connect-base": "^0.0.28", "@noble/hashes": "^1.3.0", "eventemitter3": "^5.0.1", "uuid": "^9.0.0" diff --git a/sdk/pnpm-lock.yaml b/sdk/pnpm-lock.yaml index 1c5774ec..6b75f828 100644 --- a/sdk/pnpm-lock.yaml +++ b/sdk/pnpm-lock.yaml @@ -37,58 +37,6 @@ importers: specifier: ^4.9.0 version: 4.9.4 - apps/base: - dependencies: - cross-fetch: - specifier: ^3.1.6 - version: 3.1.6 - eventemitter3: - specifier: ^5.0.1 - version: 5.0.1 - isomorphic-localstorage: - specifier: ^1.0.2 - version: 1.0.2 - isomorphic-ws: - specifier: ^5.0.0 - version: 5.0.0(ws@8.13.0) - uuid: - specifier: ^9.0.0 - version: 9.0.0 - ws: - specifier: ^8.13.0 - version: 8.13.0 - devDependencies: - '@rollup/plugin-commonjs': - specifier: ^25.0.0 - version: 25.0.0(rollup@3.23.1) - '@rollup/plugin-node-resolve': - specifier: ^15.1.0 - version: 15.1.0(rollup@3.23.1) - '@rollup/plugin-terser': - specifier: ^0.4.3 - version: 0.4.3(rollup@3.23.1) - '@rollup/plugin-typescript': - specifier: ^11.1.1 - version: 11.1.1(rollup@3.23.1)(tslib@2.5.3)(typescript@5.1.3) - '@types/node': - specifier: ^20.3.0 - version: 20.3.0 - '@vitest/ui': - specifier: ^0.31.1 - version: 0.31.1(vitest@0.31.1) - rollup: - specifier: ^3.23.1 - version: 3.23.1 - rollup-plugin-dts: - specifier: ^5.3.0 - version: 5.3.0(rollup@3.23.1)(typescript@5.1.3) - tslib: - specifier: ^2.5.3 - version: 2.5.3 - typescript: - specifier: ^5.1.3 - version: 5.1.3 - apps/docs: dependencies: '@docusaurus/core': @@ -287,8 +235,8 @@ importers: specifier: ^0.0.11 version: 0.0.11 '@nightlylabs/nightly-connect-base': - specifier: ^0.0.27 - version: link:../../apps/base + specifier: ^0.0.28 + version: link:../base eventemitter3: specifier: ^5.0.1 version: 5.0.1 @@ -327,6 +275,58 @@ importers: specifier: ^5.1.3 version: 5.1.6 + packages/base: + dependencies: + cross-fetch: + specifier: ^3.1.6 + version: 3.1.6 + eventemitter3: + specifier: ^5.0.1 + version: 5.0.1 + isomorphic-localstorage: + specifier: ^1.0.2 + version: 1.0.2 + isomorphic-ws: + specifier: ^5.0.0 + version: 5.0.0(ws@8.14.2) + uuid: + specifier: ^9.0.0 + version: 9.0.0 + ws: + specifier: ^8.13.0 + version: 8.14.2(bufferutil@4.0.7)(utf-8-validate@5.0.10) + devDependencies: + '@rollup/plugin-commonjs': + specifier: ^25.0.0 + version: 25.0.0(rollup@3.23.1) + '@rollup/plugin-node-resolve': + specifier: ^15.1.0 + version: 15.2.1(rollup@3.23.1) + '@rollup/plugin-terser': + specifier: ^0.4.3 + version: 0.4.3(rollup@3.23.1) + '@rollup/plugin-typescript': + specifier: ^11.1.1 + version: 11.1.1(rollup@3.23.1)(tslib@2.6.2)(typescript@5.1.6) + '@types/node': + specifier: ^20.3.0 + version: 20.9.0 + '@vitest/ui': + specifier: ^0.31.1 + version: 0.31.1(vitest@0.31.1) + rollup: + specifier: ^3.23.1 + version: 3.23.1 + rollup-plugin-dts: + specifier: ^5.3.0 + version: 5.3.0(rollup@3.23.1)(typescript@5.1.6) + tslib: + specifier: ^2.5.3 + version: 2.6.2 + typescript: + specifier: ^5.1.3 + version: 5.1.6 + packages/eslint-config-custom: dependencies: '@typescript-eslint/eslint-plugin': @@ -430,8 +430,8 @@ importers: packages/polkadot: dependencies: '@nightlylabs/nightly-connect-base': - specifier: 0.0.27 - version: link:../../apps/base + specifier: 0.0.28 + version: link:../base '@polkadot/api': specifier: ^10.10.1 version: 10.10.1 @@ -577,8 +577,8 @@ importers: packages/selector-base: dependencies: '@nightlylabs/nightly-connect-base': - specifier: 0.0.27 - version: link:../../apps/base + specifier: 0.0.28 + version: link:../base '@nightlylabs/wallet-selector-modal': specifier: 0.2.1 version: link:../modal @@ -770,8 +770,8 @@ importers: packages/solana: dependencies: '@nightlylabs/nightly-connect-base': - specifier: 0.0.27 - version: link:../../apps/base + specifier: 0.0.28 + version: link:../base '@solana/web3.js': specifier: ^1.77.2 version: 1.77.2 @@ -831,8 +831,8 @@ importers: specifier: ^0.8.0 version: 0.8.0 '@nightlylabs/nightly-connect-base': - specifier: ^0.0.27 - version: link:../../apps/base + specifier: ^0.0.28 + version: link:../base '@noble/hashes': specifier: ^1.3.0 version: 1.3.2 @@ -5630,7 +5630,7 @@ packages: '@polkadot/util': 12.5.1 '@polkadot/util-crypto': 12.3.2(@polkadot/util@12.5.1) '@polkadot/x-global': 12.3.2 - tslib: 2.6.0 + tslib: 2.6.2 transitivePeerDependencies: - bufferutil - supports-color @@ -8015,10 +8015,6 @@ packages: /@types/node@18.11.18: resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==} - /@types/node@20.3.0: - resolution: {integrity: sha512-cumHmIAf6On83X7yP+LrsEyUOf/YlociZelmpRYaGFydoaPdxdt80MAbu6vWerQT2COCp2nPvHdsbD7tHn/YlQ==} - dev: true - /@types/node@20.4.2: resolution: {integrity: sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw==} dev: false @@ -13049,14 +13045,6 @@ packages: ws: 7.5.9 dev: false - /isomorphic-ws@5.0.0(ws@8.13.0): - resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} - peerDependencies: - ws: '*' - dependencies: - ws: 8.13.0 - dev: false - /isomorphic-ws@5.0.0(ws@8.14.2): resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==} peerDependencies: @@ -17217,10 +17205,6 @@ packages: /tslib@2.5.3: resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==} - /tslib@2.6.0: - resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} - dev: false - /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} @@ -18408,19 +18392,6 @@ packages: optional: true dev: false - /ws@8.13.0: - resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==} - engines: {node: '>=10.0.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: '>=5.0.2' - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - dev: false - /ws@8.14.2(bufferutil@4.0.7)(utf-8-validate@5.0.10): resolution: {integrity: sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==} engines: {node: '>=10.0.0'}