Skip to content

Commit

Permalink
Merge branch 'master' into ps/chore/allow-select-network-to-accept-op…
Browse files Browse the repository at this point in the history
…tional-params
  • Loading branch information
petertonysmith94 authored Sep 13, 2024
2 parents 4c22f55 + a9f31ca commit 4699be9
Show file tree
Hide file tree
Showing 33 changed files with 3,847 additions and 5,314 deletions.
13 changes: 13 additions & 0 deletions .changeset/heavy-geckos-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"@fuel-ts/abi-coder": patch
"@fuel-ts/abi-typegen": patch
"@fuel-ts/account": patch
"@fuel-ts/address": patch
"create-fuels": patch
"@fuel-ts/crypto": patch
"fuels": patch
"@fuel-ts/hasher": patch
"@fuel-ts/logger": patch
---

build(deps): bump the deps group across 1 directory with 38 updates
28 changes: 14 additions & 14 deletions apps/create-fuels-counter-guide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@
"dependencies": {
"@fuels/connectors": "^0.27.1",
"@fuels/react": "^0.27.1",
"@tanstack/react-query": "^5.52.1",
"@tanstack/react-router": "^1.48.1",
"@wagmi/connectors": "^5.1.8",
"@tanstack/react-query": "^5.55.4",
"@tanstack/react-router": "^1.56.5",
"fuels": "workspace:*",
"@wagmi/connectors": "^5.1.9",
"@wagmi/core": "^2.13.4",
"dotenv": "^16.4.5",
"fuels": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hot-toast": "^2.4.1",
"react-use": "^17.5.1"
},
"devDependencies": {
"@eslint/js": "^9.9.1",
"@playwright/test": "^1.46.1",
"@tanstack/router-plugin": "^1.47.0",
"@types/node": "^22.2.0",
"@eslint/js": "^9.10.0",
"@tanstack/router-plugin": "^1.56.4",
"@types/node": "^22.5.4",
"@playwright/test": "^1.47.0",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3",
"@vitejs/plugin-react-swc": "^3.5.0",
"@vitejs/plugin-react-swc": "^3.7.0",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.11",
"globals": "^15.9.0",
"postcss": "^8",
"postcss": "^8.4.45",
"tailwindcss": "^3.4.10",
"typescript": "~5.4.5",
"typescript-eslint": "^8.0.0",
"vite": "^5.4.2",
"vitest": "^1.6.0"
"typescript": "~5.6.2",
"typescript-eslint": "^8.5.0",
"vite": "^5.4.3",
"vitest": "^2.0.5"
}
}
6 changes: 3 additions & 3 deletions apps/demo-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
},
"dependencies": {
"@fuels/vm-asm": "0.56.0",
"@types/node": "^22.2.0",
"@types/node": "^22.5.4",
"@types/react-dom": "^18.3",
"@types/react": "^18.3.5",
"fuels": "workspace:*",
"next": "14.2.7",
"next": "14.2.9",
"react-dom": "^18.3.1",
"react": "^18.3.1",
"typescript": "~5.4.5"
"typescript": "~5.6.2"
}
}
4 changes: 2 additions & 2 deletions apps/demo-react-cra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"dependencies": {
"@fuels/vm-asm": "0.56.0",
"@testing-library/react": "^16.0.1",
"@types/node": "^22.2.0",
"@types/node": "^22.5.4",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3",
"eslint-config-react-app": "^7.0.1",
"fuels": "workspace:*",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-scripts": "5.0.1",
"typescript": "~5.4.5",
"typescript": "~5.6.2",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions apps/demo-react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"devDependencies": {
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.11",
"typescript": "~5.4.5",
"vite": "^5.4.2"
"typescript": "~5.6.2",
"vite": "^5.4.3"
}
}
12 changes: 6 additions & 6 deletions apps/demo-wallet-sdk-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
"dependencies": {
"@fuels/connectors": "^0.27.1",
"@fuels/react": "^0.27.1",
"@tanstack/react-query": "^5.52.1",
"@tanstack/react-query": "^5.55.4",
"fuels": "workspace:*",
"next": "14.2.7",
"next": "14.2.9",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@types/node": "^22.2.0",
"@types/node": "^22.5.4",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3",
"eslint": "^8.57.0",
"eslint-config-next": "14.2.7",
"postcss": "^8",
"eslint-config-next": "14.2.9",
"postcss": "^8.4.45",
"postcss-load-config": "^6.0.1",
"tailwindcss": "^3.4.10",
"typescript": "~5.4.5"
"typescript": "~5.6.2"
}
}
2 changes: 1 addition & 1 deletion apps/docs-snippets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@fuel-ts/utils": "workspace:*",
"ethers": "^6.13.2",
"fuels": "workspace:*",
"vitest": "^1.6.0"
"vitest": "^2.0.5"
},
"keywords": [],
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"typedoc-plugin-merge-modules": "^6.0.0",
"vitepress-plugin-search": "1.0.4-alpha.22",
"vitepress": "1.3.4",
"vue": "^3.4.38"
"vue": "^3.5.3"
}
}
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@
"@internal/fuel-core": "workspace:*",
"@internal/tsup": "workspace:*",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@playwright/test": "^1.46.1",
"@types/node": "^22.2.0",
"@playwright/test": "^1.47.0",
"@types/node": "^22.5.4",
"@types/node-fetch": "^2.6.11",
"@types/web": "^0.0.159",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.21.0",
"@vitest/browser": "^1.6.0",
"@vitest/coverage-istanbul": "^1.6.0",
"@vitest/browser": "^2.0.5",
"@vitest/coverage-istanbul": "^2.0.5",
"autocannon": "^7.15.0",
"clinic": "^13.0.0",
"compare-versions": "^6.1.1",
Expand All @@ -108,29 +108,29 @@
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-tsdoc": "^0.3.0",
"glob": "^10.2.6",
"knip": "^5.27.4",
"glob": "^10.4.5",
"knip": "^5.30.0",
"memfs": "^4.11.1",
"nodemon": "^3.1.4",
"npm-run-all": "^4.1.5",
"nyc": "^17.0.0",
"open": "^8.4.2",
"open": "^10.1.0",
"prettier": "^3.3.3",
"rimraf": "^5.0.8",
"textlint": "^14.2.0",
"syncpack": "12.3.3",
"textlint": "^13.3.2",
"textlint-rule-no-dead-link": "^5.2.0",
"ts-generator": "^0.1.1",
"tsup": "^6.7.0",
"tsx": "^4.17.0",
"turbo": "^2.0.14",
"typescript": "~5.4.5",
"vite": "^5.4.2",
"tsx": "^4.19.0",
"turbo": "^2.1.1",
"typescript": "~5.6.2",
"vite": "^5.4.3",
"vite-plugin-json5": "^1.1.2",
"vite-plugin-node-polyfills": "^0.22.0",
"vite-plugin-plain-text": "^1.4.2",
"vitest": "^1.6.0",
"webdriverio": "^8.40.2"
"vitest": "^2.0.5",
"webdriverio": "^9.0.9"
},
"pnpm": {
"overrides": {
Expand Down
2 changes: 1 addition & 1 deletion packages/abi-coder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"@fuel-ts/interfaces": "workspace:*",
"@fuel-ts/math": "workspace:*",
"@fuel-ts/utils": "workspace:*",
"type-fest": "^4.24.0"
"type-fest": "^4.26.1"
}
}
5 changes: 2 additions & 3 deletions packages/abi-typegen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,14 @@
"@fuel-ts/utils": "workspace:*",
"@fuel-ts/versions": "workspace:*",
"commander": "12.1.0",
"glob": "^10.2.6",
"glob": "^10.4.5",
"handlebars": "^4.7.8",
"mkdirp": "^1.0.4",
"mkdirp": "^3.0.1",
"ramda": "^0.30.1",
"rimraf": "^5.0.8"
},
"devDependencies": {
"@internal/forc": "workspace:*",
"@types/mkdirp": "^1.0.2",
"@types/ramda": "^0.30.2",
"@types/rimraf": "^3.0.2"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/abi-typegen/src/cli.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('cli.ts', () => {
}
});

const exit = vi.spyOn(process, 'exit').mockImplementation(vi.fn());
const exit = vi.spyOn(process, 'exit').mockImplementation(vi.fn() as never);
const err = vi.spyOn(stderr, 'write').mockResolvedValue(true);

return { exit, err, runTypegen };
Expand Down
2 changes: 1 addition & 1 deletion packages/abi-typegen/src/runTypegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ErrorCode, FuelError } from '@fuel-ts/errors';
import { versions as builtinVersions, type BinaryVersions } from '@fuel-ts/versions';
import { readFileSync, writeFileSync } from 'fs';
import { globSync } from 'glob';
import mkdirp from 'mkdirp';
import { mkdirp } from 'mkdirp';
import { basename } from 'path';
import { rimrafSync } from 'rimraf';

Expand Down
4 changes: 2 additions & 2 deletions packages/account/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@fuel-ts/utils": "workspace:*",
"@fuel-ts/versions": "workspace:*",
"@fuels/vm-asm": "0.56.0",
"@noble/curves": "^1.4.2",
"@noble/curves": "^1.6.0",
"events": "^3.3.0",
"graphql": "^16.9.0",
"graphql-request": "5.0.0",
Expand All @@ -69,7 +69,7 @@
"ramda": "^0.30.1"
},
"devDependencies": {
"type-fest": "^4.24.0",
"type-fest": "^4.26.1",
"@fuel-ts/hasher": "workspace:*",
"@fuel-ts/math": "workspace:*",
"@fuel-ts/utils": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/account/src/providers/assets/utils/network.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Asset } from '../types'
import { Asset } from '../types';
import { getAssetEth, getAssetFuel, getAssetWithNetwork, getDefaultChainId } from '../utils/network';
import { CHAIN_IDS } from '../../chains'
import { CHAIN_IDS } from '../../chains';
import { assets } from '../assets';

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/address/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@fuel-ts/errors": "workspace:*",
"@fuel-ts/interfaces": "workspace:*",
"@fuel-ts/utils": "workspace:^",
"@noble/hashes": "^1.3.3",
"@noble/hashes": "^1.5.0",
"bech32": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/contract/src/test-utils/launch-test-node.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ describe('launchTestNode', () => {

const {
provider: { url },
} = spy.mock.results[0].value as { provider: { url: string } };
} = await spy.mock.results[0].value;

// test will time out if the node isn't killed
await waitUntilUnreachable(url);
Expand Down
4 changes: 2 additions & 2 deletions packages/create-fuels/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
"@iarna/toml": "^2.2.5",
"chalk": "4",
"commander": "12.1.0",
"ora": "5.4.1",
"ora": "8.1.0",
"prompts": "^2.4.2"
},
"devDependencies": {
"@fuel-ts/errors": "workspace:*",
"@fuel-ts/versions": "workspace:*",
"@types/prompts": "^2.4.8",
"glob": "^10.2.6"
"glob": "^10.4.5"
}
}
2 changes: 1 addition & 1 deletion packages/crypto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"@fuel-ts/interfaces": "workspace:*",
"@fuel-ts/math": "workspace:*",
"@fuel-ts/utils": "workspace:^",
"@noble/hashes": "^1.3.3"
"@noble/hashes": "^1.5.0"
}
}
7 changes: 1 addition & 6 deletions packages/fuel-gauge/src/transaction-response.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@ async function verifyKeepAliveMessageWasSent(subscriptionStream: ReadableStream<
}

function getSubscriptionStreamFromFetch(streamHolder: { stream: ReadableStream<Uint8Array> }) {
function getFetchMock(
fetchSpy: MockInstance<
[input: RequestInfo | URL, init?: RequestInit | undefined],
Promise<Response>
>
) {
function getFetchMock(fetchSpy: MockInstance) {
return async (...args: Parameters<typeof fetch>) => {
/**
* We need to restore the original fetch implementation so that fetching is possible
Expand Down
8 changes: 4 additions & 4 deletions packages/fuels/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
"@fuel-ts/versions": "workspace:*",
"bundle-require": "^5.0.0",
"chalk": "4",
"chokidar": "^3.5.3",
"chokidar": "^3.6.0",
"commander": "12.1.0",
"esbuild": "^0.22.0",
"glob": "^10.2.6",
"esbuild": "^0.23.1",
"glob": "^10.4.5",
"handlebars": "^4.7.8",
"joycon": "^3.1.1",
"lodash.camelcase": "^4.3.0",
Expand All @@ -95,7 +95,7 @@
"devDependencies": {
"@types/lodash.camelcase": "^4.3.9",
"@types/rimraf": "^3.0.2",
"vite": "^5.4.2"
"vite": "^5.4.3"
},
"keywords": [
"ethereum",
Expand Down
6 changes: 3 additions & 3 deletions packages/fuels/test/utils/mockAutoStartFuelCore.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { SpyInstance } from 'vitest';
import type { MockInstance } from 'vitest';

import * as autoStartFuelCoreMod from '../../src/cli/commands/dev/autoStartFuelCore';

export const mockStartFuelCore = (): {
killChildProcess: SpyInstance;
autoStartFuelCore: SpyInstance;
killChildProcess: MockInstance;
autoStartFuelCore: MockInstance;
fuelCore: autoStartFuelCoreMod.FuelCoreNode;
} => {
const killChildProcess = vi.fn();
Expand Down
2 changes: 1 addition & 1 deletion packages/hasher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"@fuel-ts/crypto": "workspace:*",
"@fuel-ts/interfaces": "workspace:^",
"@fuel-ts/utils": "workspace:*",
"@noble/hashes": "^1.3.3"
"@noble/hashes": "^1.5.0"
}
}
Loading

0 comments on commit 4699be9

Please sign in to comment.