Skip to content

Commit

Permalink
chore(project): unnest and flatten configs to reduce complexity
Browse files Browse the repository at this point in the history
  • Loading branch information
fuxingloh committed Jun 17, 2024
1 parent b656f92 commit 6a0c53a
Show file tree
Hide file tree
Showing 29 changed files with 317 additions and 233 deletions.
11 changes: 0 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,3 @@ updates:
patterns:
- 'next'
- '@next/*'
workspace:
update-types:
- 'minor'
- 'patch'
patterns:
- 'prettier-*'
- 'typescript-eslint'
- 'globals'
- '@eslint/*'
- 'eslint'
- 'eslint-*'
1 change: 1 addition & 0 deletions .idea/dictionaries/fuxing.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,19 @@
"*": "prettier --write --ignore-unknown"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@swc/core": "^1.5.29",
"@swc/jest": "^0.2.36",
"@types/node": "^20.14.2",
"@workspace/eslint-config": "workspace:*",
"@workspace/jest-preset": "workspace:*",
"@workspace/prettier-config": "workspace:*",
"@workspace/jest": "workspace:*",
"@workspace/tsconfig": "workspace:*",
"eslint": "^8.57.0",
"husky": "^9.0.11",
"jest": "29.7.0",
"lint-staged": "^15.2.7",
"prettier": "^3.3.2",
"prettier-plugin-packagejson": "^2.5.0",
"prettier-plugin-tailwindcss": "^0.6.4",
"turbo": "^2.0.4",
"typescript": "5.4.5",
"wait-for-expect": "^3.0.2"
"typescript": "5.4.5"
},
"packageManager": "pnpm@8.15.8",
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
]
},
"jest": {
"preset": "@workspace/jest-preset"
"preset": "@workspace/jest"
},
"dependencies": {
"@chainfile/schema": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-agent/src/routers/agent.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Chainfile } from '@chainfile/schema';
import { expect, it } from '@jest/globals';
import { expect, it } from '@workspace/jest/globals';

import { createCaller } from './_app';

Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-docker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
]
},
"jest": {
"preset": "@workspace/jest-preset"
"preset": "@workspace/jest"
},
"dependencies": {
"@chainfile/schema": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-docker/src/compose.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Chainfile } from '@chainfile/schema';
import { describe, expect, it } from '@jest/globals';
import { describe, expect, it } from '@workspace/jest/globals';

import { Compose } from './compose';

Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
]
},
"jest": {
"preset": "@workspace/jest-preset"
"preset": "@workspace/jest"
},
"dependencies": {
"ajv": "^8.16.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-schema/validate.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, expect, it } from '@jest/globals';
import { describe, expect, it } from '@workspace/jest/globals';

import { validate } from './validate';

Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-testcontainers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
]
},
"jest": {
"preset": "@workspace/jest-preset"
"preset": "@workspace/jest"
},
"dependencies": {
"@chainfile/docker": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Chainfile } from '@chainfile/schema';
import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
import { afterAll, beforeAll, describe, expect, it } from '@workspace/jest/globals';

import { AgentContainer } from './agent';
import { ChainfileTestcontainers } from './testcontainers';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
import waitForExpect from 'wait-for-expect';
import { afterAll, beforeAll, describe, expect, it } from '@workspace/jest/globals';
import waitFor from '@workspace/jest/wait-for';

import { ChainfileContainer, ChainfileTestcontainers } from '../src';
import mainnet from './bitcoin-mainnet.json';
Expand Down Expand Up @@ -114,7 +114,7 @@ describe('bitcoind', () => {
describe.skip('synchronization', () => {
// Takes too long to run and is not deterministic
beforeAll(async () => {
await waitForExpect(async () => {
await waitFor(async () => {
const response = await bitcoind.rpc({
method: 'getblockcount',
params: [],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
import { afterAll, beforeAll, describe, expect, it } from '@workspace/jest/globals';

import { ChainfileContainer, ChainfileTestcontainers } from '../src';
import regtest from './bitcoin-regtest.json';
Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-testcontainers/tests/ganache.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { afterAll, beforeAll, expect, it } from '@jest/globals';
import { afterAll, beforeAll, expect, it } from '@workspace/jest/globals';

import { ChainfileTestcontainers } from '../src';
import localhost from './ganache.json';
Expand Down
2 changes: 1 addition & 1 deletion packages/chainfile-testcontainers/tests/hardhat.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { afterAll, beforeAll, expect, it } from '@jest/globals';
import { afterAll, beforeAll, expect, it } from '@workspace/jest/globals';

import { ChainfileTestcontainers } from '../src';
import localhost from './hardhat.json';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
import { afterAll, beforeAll, describe, expect, it } from '@workspace/jest/globals';

import { ChainfileContainer, ChainfileTestcontainers } from '../src';
import solana from './solana-test-validator.json';
Expand Down
Loading

0 comments on commit 6a0c53a

Please sign in to comment.