Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/multi-5428e33211
Browse files Browse the repository at this point in the history
  • Loading branch information
jribbink authored Nov 21, 2024
2 parents d7076a9 + 2150105 commit d2e7ace
Show file tree
Hide file tree
Showing 29 changed files with 114 additions and 49 deletions.
5 changes: 5 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@
"@onflow/util-uid": "1.2.2"
},
"changesets": [
"brown-bobcats-remain",
"fresh-cows-repair",
"little-spies-glow",
"lovely-bikes-applaud",
"odd-actors-ring",
"pink-students-divide",
"poor-carrots-wink",
"rare-apes-argue",
"rotten-paws-retire",
"shaggy-snakes-vanish",
"slow-lies-fix",
"slow-peaches-vanish",
Expand Down
2 changes: 1 addition & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"devDependencies": {
"@babel/preset-typescript": "^7.25.7",
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@types/estree": "^1.0.6",
"@types/jest": "^29.5.13",
"@typescript-eslint/eslint-plugin": "^6.21.0",
Expand Down
6 changes: 6 additions & 0 deletions packages/fcl-bundle/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @onflow/fcl-bundle

## 1.6.0-alpha.1

### Minor Changes

- [#1970](https://github.com/onflow/fcl-js/pull/1970) [`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26) Thanks [@jribbink](https://github.com/jribbink)! - Add `rollup-plugin-postcss` & `@rollup/plugin-image`

## 1.5.1-alpha.0

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/fcl-bundle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/fcl-bundle",
"version": "1.5.1-alpha.0",
"version": "1.6.0-alpha.1",
"description": "FCL Bundler Tool",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand Down
9 changes: 9 additions & 0 deletions packages/fcl-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @onflow/fcl

## 1.13.0-alpha.5

### Patch Changes

- [#1970](https://github.com/onflow/fcl-js/pull/1970) [`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26) Thanks [@jribbink](https://github.com/jribbink)! - Pass missing fields to service redirects in execService

- Updated dependencies []:
- @onflow/sdk@1.5.4-alpha.2

## 1.13.0-alpha.4

### Minor Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/fcl-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/fcl-core",
"version": "1.13.0-alpha.4",
"version": "1.13.0-alpha.5",
"description": "Flow Client Library",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand All @@ -19,8 +19,8 @@
}
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/typedefs": "1.4.0-alpha.1",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@onflow/typedefs": "1.4.0-alpha.2",
"@types/estree": "^1.0.6",
"@types/jest": "^29.5.13",
"@types/node": "^18.19.57",
Expand Down Expand Up @@ -52,7 +52,7 @@
"@onflow/config": "1.5.1-alpha.0",
"@onflow/interaction": "0.0.11",
"@onflow/rlp": "1.2.3-alpha.0",
"@onflow/sdk": "1.5.4-alpha.1",
"@onflow/sdk": "1.5.4-alpha.2",
"@onflow/transport-http": "1.10.3-alpha.0",
"@onflow/types": "1.4.1-alpha.0",
"@onflow/util-actor": "1.3.4-alpha.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/fcl-react-native/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @onflow/fcl-react-native

## 1.9.7-alpha.5

### Patch Changes

- Updated dependencies [[`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26)]:
- @onflow/fcl-core@1.13.0-alpha.5
- @onflow/sdk@1.5.4-alpha.2

## 1.9.7-alpha.4

### Patch Changes
Expand Down
10 changes: 5 additions & 5 deletions packages/fcl-react-native/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/fcl-react-native",
"version": "1.9.7-alpha.4",
"version": "1.9.7-alpha.5",
"description": "Flow Client Library",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand All @@ -19,8 +19,8 @@
}
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/typedefs": "1.4.0-alpha.1",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@onflow/typedefs": "1.4.0-alpha.2",
"@types/estree": "^1.0.6",
"@types/node": "^18.19.57",
"eslint": "^8.57.1",
Expand Down Expand Up @@ -48,10 +48,10 @@
"dependencies": {
"@babel/runtime": "^7.25.7",
"@onflow/config": "1.5.1-alpha.0",
"@onflow/fcl-core": "1.13.0-alpha.4",
"@onflow/fcl-core": "1.13.0-alpha.5",
"@onflow/interaction": "0.0.11",
"@onflow/rlp": "1.2.3-alpha.0",
"@onflow/sdk": "1.5.4-alpha.1",
"@onflow/sdk": "1.5.4-alpha.2",
"@onflow/types": "1.4.1-alpha.0",
"@onflow/util-actor": "1.3.4-alpha.0",
"@onflow/util-address": "1.2.3-alpha.0",
Expand Down
27 changes: 19 additions & 8 deletions packages/fcl-wc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @onflow/fcl-wc

## 5.5.0-alpha.5

### Minor Changes

- [#1970](https://github.com/onflow/fcl-js/pull/1970) [`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26) Thanks [@jribbink](https://github.com/jribbink)! - Add UI notifications for pending requests

### Patch Changes

- Updated dependencies [[`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26)]:
- @onflow/fcl-core@1.13.0-alpha.5

## 5.4.1-alpha.4

### Patch Changes
Expand Down Expand Up @@ -453,7 +464,7 @@
```javascript
import * as fcl from "@onflow/fcl"
import {initFclWc} from "@onflow/fcl-wc"

const {FclConnectServicePlugin, client} = await initFclWc({
projectId: PROJECT_ID,
metadata: {
Expand All @@ -463,20 +474,20 @@
icons: ["https://avatars.githubusercontent.com/u/62387156?s=280&v=4"],
},
})

fcl.pluginRegistry.add(FclConnectServicePlugin)
```

### Using the client

```javascript
import {getSdkError} from "@onflow/fcl-wc"

client.on("session_update", ({topic, params}) => {
const session = client.session.get(topic)
console.log("EVENT", "session_update", {topic, params, session})
})

await client.disconnect({
topic: session.topic,
reason: getSdkError("USER_DISCONNECTED"),
Expand Down Expand Up @@ -647,7 +658,7 @@
```javascript
import * as fcl from "@onflow/fcl"
import {initFclWc} from "@onflow/fcl-wc"

const {FclConnectServicePlugin, client} = await initFclWc({
projectId: PROJECT_ID,
metadata: {
Expand All @@ -657,20 +668,20 @@
icons: ["https://avatars.githubusercontent.com/u/62387156?s=280&v=4"],
},
})

fcl.pluginRegistry.add(FclConnectServicePlugin)
```
### Using the client
```javascript
import {getSdkError} from "@onflow/fcl-wc"

client.on("session_update", ({topic, params}) => {
const session = client.session.get(topic)
console.log("EVENT", "session_update", {topic, params, session})
})

await client.disconnect({
topic: session.topic,
reason: getSdkError("USER_DISCONNECTED"),
Expand Down
8 changes: 4 additions & 4 deletions packages/fcl-wc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/fcl-wc",
"version": "5.4.1-alpha.4",
"version": "5.5.0-alpha.5",
"description": "WalletConnect adapter for FCL",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand Down Expand Up @@ -30,8 +30,8 @@
"devDependencies": {
"@babel/plugin-transform-react-jsx": "^7.25.9",
"@babel/preset-typescript": "^7.25.7",
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/typedefs": "^1.4.0-alpha.1",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@onflow/typedefs": "^1.4.0-alpha.2",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.1",
"eslint-plugin-jsdoc": "^46.10.1",
Expand All @@ -53,6 +53,6 @@
"tailwindcss": "^3.4.14"
},
"peerDependencies": {
"@onflow/fcl-core": "1.13.0-alpha.4"
"@onflow/fcl-core": "1.13.0-alpha.5"
}
}
13 changes: 13 additions & 0 deletions packages/fcl/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @onflow/fcl

## 1.13.0-alpha.7

### Minor Changes

- [#1970](https://github.com/onflow/fcl-js/pull/1970) [`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26) Thanks [@jribbink](https://github.com/jribbink)! - Add `walletconnect.disableNotifications` config option to disable WC notification UI

### Patch Changes

- Updated dependencies [[`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26), [`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26)]:
- @onflow/fcl-wc@5.5.0-alpha.5
- @onflow/fcl-core@1.13.0-alpha.5
- @onflow/sdk@1.5.4-alpha.2

## 1.13.0-alpha.6

### Minor Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/fcl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/fcl",
"version": "1.13.0-alpha.6",
"version": "1.13.0-alpha.7",
"description": "Flow Client Library",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand All @@ -19,8 +19,8 @@
}
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/typedefs": "1.4.0-alpha.1",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@onflow/typedefs": "1.4.0-alpha.2",
"@types/estree": "^1.0.6",
"@types/jest": "^29.5.13",
"@types/node": "^18.19.57",
Expand Down Expand Up @@ -49,11 +49,11 @@
"dependencies": {
"@babel/runtime": "^7.25.7",
"@onflow/config": "1.5.1-alpha.0",
"@onflow/fcl-core": "1.13.0-alpha.4",
"@onflow/fcl-wc": "5.4.1-alpha.4",
"@onflow/fcl-core": "1.13.0-alpha.5",
"@onflow/fcl-wc": "5.5.0-alpha.5",
"@onflow/interaction": "0.0.11",
"@onflow/rlp": "1.2.3-alpha.0",
"@onflow/sdk": "1.5.4-alpha.1",
"@onflow/sdk": "1.5.4-alpha.2",
"@onflow/types": "1.4.1-alpha.0",
"@onflow/util-actor": "1.3.4-alpha.0",
"@onflow/util-address": "1.2.3-alpha.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/rlp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"devDependencies": {
"@babel/preset-typescript": "^7.25.7",
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@types/jest": "^29.5.13",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @onflow/sdk

## 1.5.4-alpha.2

### Patch Changes

- Updated dependencies [[`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26)]:
- @onflow/typedefs@1.4.0-alpha.2

## 1.5.4-alpha.1

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/sdk",
"version": "1.5.4-alpha.1",
"version": "1.5.4-alpha.2",
"description": "Flow SDK",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand All @@ -18,7 +18,7 @@
}
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@types/uuid": "^9.0.8",
"eslint": "^8.57.1",
"eslint-plugin-jsdoc": "^46.10.1",
Expand All @@ -44,7 +44,7 @@
"@onflow/config": "1.5.1-alpha.0",
"@onflow/rlp": "1.2.3-alpha.0",
"@onflow/transport-http": "1.10.3-alpha.0",
"@onflow/typedefs": "1.4.0-alpha.1",
"@onflow/typedefs": "1.4.0-alpha.2",
"@onflow/util-actor": "1.3.4-alpha.0",
"@onflow/util-address": "1.2.3-alpha.0",
"@onflow/util-invariant": "1.2.4-alpha.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/transport-grpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"url": "https://github.com/onflow/flow-js-sdk/issues"
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/sdk": "1.5.4-alpha.1",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@onflow/sdk": "1.5.4-alpha.2",
"jest": "^29.7.0"
},
"source": "src/sdk-send-grpc.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/transport-http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"url": "https://github.com/onflow/flow-js-sdk/issues"
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@onflow/rlp": "1.2.3-alpha.0",
"@onflow/sdk": "1.5.4-alpha.1",
"@onflow/sdk": "1.5.4-alpha.2",
"@onflow/types": "1.4.1-alpha.0",
"jest": "^29.7.0"
},
Expand Down
6 changes: 6 additions & 0 deletions packages/typedefs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @onflow/typedefs

## 1.4.0-alpha.2

### Patch Changes

- [#1970](https://github.com/onflow/fcl-js/pull/1970) [`3b31f1c02b78bf178502627e5ca1de81bdfe8f26`](https://github.com/onflow/fcl-js/commit/3b31f1c02b78bf178502627e5ca1de81bdfe8f26) Thanks [@jribbink](https://github.com/jribbink)! - Fix CurrentUser services type

## 1.4.0-alpha.1

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/typedefs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onflow/typedefs",
"version": "1.4.0-alpha.1",
"version": "1.4.0-alpha.2",
"description": "Flow JS Type Defs",
"license": "Apache-2.0",
"author": "Dapper Labs <[email protected]>",
Expand All @@ -13,7 +13,7 @@
"url": "https://github.com/onflow/flow-js-sdk/issues"
},
"devDependencies": {
"@onflow/fcl-bundle": "1.5.1-alpha.0",
"@onflow/fcl-bundle": "1.6.0-alpha.1",
"@types/node": "^18.19.57",
"eslint": "^8.57.1",
"eslint-plugin-jsdoc": "^46.10.1",
Expand Down
Loading

0 comments on commit d2e7ace

Please sign in to comment.