Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge develop #500

Merged
merged 13 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/good-terms-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blockchain-lab-um/dapp': patch
---

Fixes dapp crashing, updated formatted panel view
5 changes: 5 additions & 0 deletions .changeset/kind-turkeys-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blockchain-lab-um/masca-docs': minor
---

Added docs form `signData` RPC method
5 changes: 5 additions & 0 deletions .changeset/late-geckos-retire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blockchain-lab-um/masca': minor
---

Added `signData` RPC method (JWT and JWZ support)
5 changes: 5 additions & 0 deletions .changeset/modern-grapes-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blockchain-lab-um/masca': patch
---

Adds e2e tests for PolygonID authorization and credential offer flow.
5 changes: 5 additions & 0 deletions .changeset/neat-dogs-sip.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blockchain-lab-um/masca-types': minor
---

Added types for `signData` rpc method.
18 changes: 17 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,21 @@
"@blockchain-lab-um/masca": "1.1.0-beta.0",
"@blockchain-lab-um/masca-types": "1.1.0"
},
"changesets": []
"changesets": [
"chilly-boxes-sit",
"good-terms-impress",
"great-radios-love",
"heavy-hotels-build",
"heavy-timers-laugh",
"kind-turkeys-destroy",
"late-geckos-retire",
"long-ligers-brush",
"modern-grapes-buy",
"moody-cheetahs-perform",
"neat-dogs-sip",
"nine-ducks-explain",
"purple-jokes-hunt",
"rich-toes-marry",
"weak-frogs-occur"
]
}
5 changes: 5 additions & 0 deletions .changeset/rich-toes-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@blockchain-lab-um/masca-connector': minor
---

Added `signData` RPC method (JWT and JWZ support)
5 changes: 1 addition & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ module.exports = {
'**/__tests__/**',
'**/*.spec.ts',
],
plugins: ['jest', 'jest-extended'],
extends: ['plugin:jest/recommended', 'plugin:jest/style'],
rules: {
'jest/prefer-expect-assertions': 'off',
'jest/no-conditional-expect': 'off',
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'jest/no-export': 'off',
},

env: { jest: true },
},
],
plugins: ['@typescript-eslint', 'unused-imports'],
Expand Down Expand Up @@ -92,6 +88,7 @@ module.exports = {
'**/jest.d.ts',
'**/test/**',
'**/tests/**',
'**/vite.config.ts',
],
},
],
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CRON

on:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'

jobs:
main:
name: Nx Cloud - Cron Job
uses: nrwl/ci/.github/workflows/[email protected]
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
pnpm-version: 8.6.10
node-version: 18.16.0
number-of-agents: 2
main-branch-name: 'develop'
parallel-commands-on-agents: |
pnpm exec nx run-many --target=test:cron --parallel=2

agents:
name: Nx Cloud - Agents
uses: nrwl/ci/.github/workflows/[email protected]
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
number-of-agents: 2
pnpm-version: 8.6.10
node-version: 18.16.0
1 change: 1 addition & 0 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
- '@blockchain-lab-um/utils'
- '@blockchain-lab-um/did-provider-key'
- '@blockchain-lab-um/did-provider-ebsi'
- '@blockchain-lab-um/dapp'

# Wait for the workflow to finish before starting a new one
concurrency: ${{ github.workflow }}-${{ github.ref }}
Expand Down
7 changes: 6 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": ["build", "test", "lint", "test:ci"]
"cacheableOperations": ["build", "test", "lint", "test:ci", "test:cron"]
}
}
},
Expand Down Expand Up @@ -53,6 +53,11 @@
"inputs": ["default", "^production"],
"dependsOn": ["^build"],
"outputs": ["{projectRoot}/coverage"]
},
"test:cron": {
"inputs": ["default", "^production"],
"dependsOn": ["^build"],
"outputs": ["{projectRoot}/coverage"]
}
},
"defaultBase": "develop"
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"prepare": "is-ci || husky install",
"prettier": "prettier --write .",
"test": "pnpm nx run-many --target=test",
"test:ci": "pnpm nx run-many --target=test:ci"
"test:ci": "pnpm nx run-many --target=test:ci",
"test:cron": "cross-env CRON=true pnpm nx run-many --target=test:cron"
},
"dependencies": {
"@changesets/cli": "2.26.2"
Expand Down Expand Up @@ -95,7 +96,7 @@
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"@ceramicnetwork/[email protected]": "patches/@[email protected]",
"@metamask/[email protected].1": "patches/@[email protected].1.patch",
"@metamask/[email protected].2": "patches/@[email protected].2.patch",
"@changesets/[email protected]": "patches/@[email protected]"
},
"allowNonAppliedPatches": true
Expand Down
11 changes: 11 additions & 0 deletions packages/connector/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## 1.2.0-beta.0

### Minor Changes

- [#484](https://github.com/blockchain-lab-um/masca/pull/484) [`a07fdcc`](https://github.com/blockchain-lab-um/masca/commit/a07fdcc07e90ba949def10bbcac6b12fbe42e4c0) Thanks [@martines3000](https://github.com/martines3000)! - Added `signData` RPC method (JWT and JWZ support)

### Patch Changes

- Updated dependencies [[`a07fdcc`](https://github.com/blockchain-lab-um/masca/commit/a07fdcc07e90ba949def10bbcac6b12fbe42e4c0)]:
- @blockchain-lab-um/[email protected]

## 1.1.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/connector/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@blockchain-lab-um/masca-connector",
"version": "1.1.0",
"version": "1.2.0-beta.0",
"description": "Library for using Masca on the frontend",
"keywords": [
"MetaMask",
Expand Down Expand Up @@ -41,7 +41,7 @@
"prepack": "pnpm build"
},
"dependencies": {
"@blockchain-lab-um/masca-types": "1.1.0",
"@blockchain-lab-um/masca-types": "1.2.0-beta.0",
"@blockchain-lab-um/utils": "1.3.7",
"@didtools/pkh-ethereum": "0.4.0",
"@metamask/detect-provider": "^2.0.0",
Expand Down
Loading