Skip to content

Commit

Permalink
fix(build): export types for esm (uport-project#106)
Browse files Browse the repository at this point in the history
* fix(build): export types for esm builds and fix imports

* fix(deps): bump dependencies

* fix(ci): bump OS version for CI builds
  • Loading branch information
mirceanis authored Oct 19, 2022
1 parent 0e7c418 commit 3b146f7
Show file tree
Hide file tree
Showing 8 changed files with 1,967 additions and 2,876 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'master'
jobs:
build-test-publish:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -24,8 +24,8 @@ jobs:

- name: "Setup git coordinates"
run: |
git config user.name uport-automation-bot
git config user.email [email protected]
git config user.name ${{secrets.GH_USER}}
git config user.email ${{secrets.GH_EMAIL}}
- name: Run semantic-release
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and Test NODE
on: [pull_request, workflow_dispatch, push]
jobs:
build-test:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
Expand Down
54 changes: 26 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@
"source": "src/index.ts",
"main": "./lib/index.cjs",
"module": "./lib/index.module.js",
"unpkg": "./lib/index.umd.js",
"types": "./lib/index.d.ts",
"umd:main": "./lib/index.umd.js",
"files": [
"lib",
"src",
"LICENSE"
],
"exports": {
".": {
"types": "./lib/index.d.ts",
"require": "./lib/index.cjs",
"import": "./lib/index.module.js"
}
Expand Down Expand Up @@ -52,39 +51,38 @@
]
},
"devDependencies": {
"@babel/core": "7.18.6",
"@babel/preset-env": "7.18.6",
"@babel/core": "7.19.3",
"@babel/preset-env": "7.19.4",
"@babel/preset-typescript": "7.18.6",
"@ethersproject/contracts": "5.6.2",
"@ethersproject/contracts": "5.7.0",
"@semantic-release/changelog": "6.0.1",
"@semantic-release/git": "10.0.1",
"@types/jest": "28.1.4",
"@typescript-eslint/eslint-plugin": "5.30.5",
"@typescript-eslint/parser": "5.30.5",
"eslint": "8.19.0",
"@types/jest": "29.2.0",
"@typescript-eslint/eslint-plugin": "5.40.1",
"@typescript-eslint/parser": "5.40.1",
"eslint": "8.25.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-jest": "26.5.3",
"eslint-plugin-jest": "27.1.3",
"eslint-plugin-prettier": "4.2.1",
"ethr-did-registry": "0.0.3",
"ganache": "7.3.2",
"jest": "28.1.2",
"microbundle": "0.15.0",
"ganache": "7.4.4",
"jest": "29.2.1",
"microbundle": "0.15.1",
"prettier": "2.7.1",
"semantic-release": "19.0.3",
"typescript": "4.7.4"
"semantic-release": "19.0.5",
"typescript": "4.8.4"
},
"dependencies": {
"@ethersproject/abstract-signer": "^5.6.2",
"@ethersproject/base64": "^5.6.1",
"@ethersproject/basex": "^5.6.1",
"@ethersproject/bytes": "^5.6.1",
"@ethersproject/providers": "^5.6.8",
"@ethersproject/signing-key": "^5.6.2",
"@ethersproject/strings": "^5.6.1",
"@ethersproject/transactions": "^5.6.2",
"@ethersproject/wallet": "^5.6.2",
"did-jwt": "^6.3.0",
"did-resolver": "^4.0.0",
"ethr-did-resolver": "^7.0.0"
"@ethersproject/abstract-signer": "^5.7.0",
"@ethersproject/base64": "^5.7.0",
"@ethersproject/basex": "^5.7.0",
"@ethersproject/bytes": "^5.7.0",
"@ethersproject/providers": "^5.7.1",
"@ethersproject/signing-key": "^5.7.0",
"@ethersproject/strings": "^5.7.0",
"@ethersproject/transactions": "^5.7.0",
"@ethersproject/wallet": "^5.7.0",
"did-jwt": "^6.9.0",
"did-resolver": "^4.0.1",
"ethr-did-resolver": "^7.0.1"
}
}
7 changes: 3 additions & 4 deletions src/__tests__/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { Resolvable, Resolver } from 'did-resolver'
import { Contract, ContractFactory } from '@ethersproject/contracts'
import { JsonRpcProvider } from '@ethersproject/providers'
import { getResolver } from 'ethr-did-resolver'
import { getResolver, EthereumDIDRegistry } from 'ethr-did-resolver'
import { DelegateTypes, EthrDID, KeyPair } from '../index'
import { createProvider, sleep } from './testUtils'
import DidRegistryContract from 'ethr-did-registry'
import { verifyJWT } from 'did-jwt'
import { arrayify } from '@ethersproject/bytes'
import { SigningKey } from '@ethersproject/signing-key'
Expand All @@ -26,7 +25,7 @@ describe('EthrDID', () => {
const provider: JsonRpcProvider = createProvider()

beforeAll(async () => {
const factory = ContractFactory.fromSolidity(DidRegistryContract).connect(provider.getSigner(0))
const factory = ContractFactory.fromSolidity(EthereumDIDRegistry).connect(provider.getSigner(0))

let registryContract: Contract
registryContract = await factory.deploy()
Expand Down Expand Up @@ -783,7 +782,7 @@ describe('EthrDID (Meta Transactions)', () => {
const provider: JsonRpcProvider = createProvider()

beforeAll(async () => {
const factory = ContractFactory.fromSolidity(DidRegistryContract).connect(provider.getSigner(0))
const factory = ContractFactory.fromSolidity(EthereumDIDRegistry).connect(provider.getSigner(0))

registryContract = await factory.deploy()
registryContract = await registryContract.deployed()
Expand Down
7 changes: 5 additions & 2 deletions src/__tests__/testUtils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { JsonRpcProvider, Web3Provider } from '@ethersproject/providers'
import { ExternalProvider, JsonRpcProvider, Web3Provider } from '@ethersproject/providers'
import ganache from 'ganache'

export function createProvider(): JsonRpcProvider {
Expand Down Expand Up @@ -49,16 +49,19 @@ export function createProvider(): JsonRpcProvider {
balance: `0x1000000000000000000000`,
},
],
})
// eslint-disable-next-line @typescript-eslint/no-explicit-any
}) as any as ExternalProvider
)
}

export async function sleep(seconds: number): Promise<void> {
return new Promise((resolve) => setTimeout(resolve, seconds * 1000))
}

export async function stopMining(provider: JsonRpcProvider): Promise<unknown> {
return provider.send('miner_stop', [])
}

export async function startMining(provider: JsonRpcProvider): Promise<unknown> {
return provider.send('miner_start', [1])
}
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class EthrDID {
return this.controller.createChangeOwnerHash(newOwner)
}

async changeOwnerSigned(newOwner: string, signature: MetaSignature, txOptions: CallOverrides): Promise<string> {
async changeOwnerSigned(newOwner: string, signature: MetaSignature, txOptions: CallOverrides = {}): Promise<string> {
if (typeof this.controller === 'undefined') {
throw new Error('a web3 provider configuration is needed for network operations')
}
Expand Down
1 change: 0 additions & 1 deletion src/thirdparty.types.d.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
declare module 'ethr-did-registry'
declare module 'ganache-cli'
Loading

0 comments on commit 3b146f7

Please sign in to comment.