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

update tsconfig #281

Merged
merged 1 commit into from
May 1, 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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"lint": "tsc --noEmit --project tsconfig.json && eslint . --ext .js,.ts && prettier --check .",
"fix": "eslint . --ext .js,.ts --fix && prettier -w .",
"prepare": "husky install",
"clean": "yarn workspaces foreach run clean",
"build": "yarn workspaces foreach run build",
"clean": "yarn workspaces foreach -pvit run clean",
"build": "yarn workspaces foreach -pvit run build",
"build-wasm": "wasm-pack build executor --target nodejs --scope acala-network && echo '' >> executor/pkg/package.json",
"build-wasm-logging": "yarn build-wasm --features=logging",
"check": "cd executor && cargo check --locked",
Expand Down
3 changes: 1 addition & 2 deletions packages/chopsticks/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
// "baseUrl": "..",
"outDir": "lib",
"rootDir": "src"
},
"exclude": ["node_modules", "src/**/*.test.ts", "vitest.config.ts", "lib"]
"exclude": ["src/**/*.test.ts"]
}
2 changes: 1 addition & 1 deletion packages/core/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"outDir": "lib",
"rootDir": "src"
},
"exclude": ["node_modules", "src/**/*.test.ts", "vitest.config.ts", "lib"],
"exclude": ["src/**/*.test.ts"],
}
2 changes: 1 addition & 1 deletion packages/e2e/src/dry-run-extrinsic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ setupApi({
describe('dry-run-extrinsic', () => {
it('dry run extrinsic', async () => {
const properties = await chain.api.chainProperties
const { alice, bob } = testingPairs(properties.ss58Format)
const { alice, bob } = testingPairs('ed25519', properties.ss58Format)

await dev.setStorage({
System: {
Expand Down
1 change: 0 additions & 1 deletion packages/e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"outDir": "lib",
"rootDir": "src",
},
"exclude": ["node_modules", "lib"],
"references": [
{ "path": "../chopsticks" },
{ "path": "../testing" },
Expand Down
4 changes: 2 additions & 2 deletions packages/testing/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ export const sendTransaction = async (tx: Promise<SubmittableExtrinsic<'promise'
}
}

export const testingPairs = (keyringType: 'ed25519' | 'sr25519' = 'ed25519') => {
export const testingPairs = (keyringType: 'ed25519' | 'sr25519' = 'ed25519', ss58Format?: number) => {
const keyringEth = createTestKeyring({ type: 'ethereum' })
// default to ed25519 because sr25519 signature is non-deterministic
const keyring = new Keyring({ type: keyringType })
const keyring = new Keyring({ type: keyringType, ss58Format })
return {
alice: keyring.addFromUri('//Alice'),
bob: keyring.addFromUri('//Bob'),
Expand Down
2 changes: 1 addition & 1 deletion packages/testing/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"rootDir": "src",
"module": "ES2022",
},
"exclude": ["node_modules", "src/**/*.test.ts", "vitest.config.ts", "lib"],
"exclude": ["src/**/*.test.ts"],
"references": [
{
"path": "../chopsticks"
Expand Down
1 change: 0 additions & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"experimentalDecorators": true,
"declaration": true,
"resolveJsonModule": true,
"types": ["node", "@polkadot/types-known", "@polkadot/types-codec"],
"baseUrl": ".",
"composite": true,
"paths": {
Expand Down
8 changes: 1 addition & 7 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
{
"extends": "./tsconfig.base.json",
"references": [
{ "path": "./packages/chopsticks" },
{ "path": "./packages/core" },
{ "path": "./packages/testing" },
{ "path": "./packages/e2e" },
],
"exclude": ["**/node_modules", "**/lib"],
"include": ["./packages/**/*.{ts,json}"]
"include": ["./packages/**/*"]
}