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: fix doc gen dependency graph #1146

Merged
merged 1 commit into from
Nov 12, 2024
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 .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ jobs:
- name: Setup Node
uses: ./.github/actions/setup-node

- name: Build
- name: Build Libraries
env:
API_KEY: ${{ secrets.API_KEY }}
run: yarn build:dev
run: yarn build:libs

- name: Unit Test
run: yarn test:ci
2 changes: 1 addition & 1 deletion aa-sdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"build": "yarn clean && yarn build:esm && yarn build:types",
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/aa-sdk/core",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/aa-sdk/core",
"clean": "rm -rf ./dist",
"test": "vitest",
"test:run": "vitest run"
Expand Down
2 changes: 1 addition & 1 deletion aa-sdk/ethers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"build": "yarn clean && yarn build:esm && yarn build:types",
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/aa-sdk/ethers",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/aa-sdk/ethers",
"clean": "rm -rf ./dist",
"test": "vitest",
"test:run": "vitest run"
Expand Down
2 changes: 1 addition & 1 deletion account-kit/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"clean": "rm -rf ./dist",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/core",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/core",
"test": "vitest --passWithNoTests",
"test:run": "vitest run --passWithNoTests"
},
Expand Down
2 changes: 1 addition & 1 deletion account-kit/infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"build": "yarn clean && yarn build:esm && yarn build:types",
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/infra",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/infra",
"clean": "rm -rf ./dist",
"test": "vitest",
"test:run": "vitest run"
Expand Down
2 changes: 1 addition & 1 deletion account-kit/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"build:dev": "lerna watch --scope='@account-kit/react' --include-dependencies -- lerna run build --scope=@account-kit/react",
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/react",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/react",
"clean": "rm -rf ./dist",
"test": "vitest --passWithNoTests",
"test:run": "vitest run --passWithNoTests"
Expand Down
2 changes: 1 addition & 1 deletion account-kit/signer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"build": "yarn clean && yarn build:esm && yarn build:types",
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/signer",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/signer",
"clean": "rm -rf ./dist",
"test": "vitest --passWithNoTests",
"test:run": "vitest run --passWithNoTests"
Expand Down
2 changes: 1 addition & 1 deletion account-kit/smart-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"build": "yarn clean && yarn build:esm && yarn build:types",
"build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
"build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
"docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/smart-contracts",
"docs:gen": "node ../../doc-gen/dist/esm/cli.js generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/smart-contracts",
"clean": "rm -rf ./dist",
"test": "vitest",
"test:run": "vitest run"
Expand Down
10 changes: 10 additions & 0 deletions examples/ui-demo/turbo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": ["//"],
"tasks": {
"build": {
"dependsOn": ["^build"],
"outputs": [".next/**", "!.next/cache/**"],
"env": ["API_KEY", "ALCHEMY_API_URL", "ALCHEMY_RPC_URL"]
}
}
}
3 changes: 3 additions & 0 deletions examples/ui-demo/vercel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"buildCommand": "cd ../.. && yarn build:demo"
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
"postgenerate": "yarn lint:write",
"preinstall": "yarn config set ignore-engines true",
"postinstall": "git submodule update --init --recursive && patch-package",
"build": "is-ci && yarn build:ci || yarn build:dev",
"build:base": "turbo run build --filter=!embedded-accounts-quickstart --filter=!ui-demo",
"build:dev": "yarn build:base --filter=!docs",
"build:ci": "yarn build:base && yarn lint:write",
"build": "yarn build:libs",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is for backwards compat, I guess I could just merge this and build:libs, but I wanted the separation just to be explicit in the CI script

"postbuild": "yarn lint:write",
"build:libs": "turbo run build --filter='./account-kit/*' --filter='./aa-sdk/*' --filter='./templates/*'",
"build:demo": "turbo run build --filter=ui-demo",
"build:site": "turbo run build --filter=docs",
"build:examples": "turbo run build",
"clean": "yarn clean:turbo && yarn clean:node_modules",
"clean:turbo": "turbo run clean",
Expand All @@ -39,7 +40,6 @@
"test:ci": "vitest run",
"lint:write": "eslint . --fix && yarn docs:gen && prettier --write --ignore-unknown .",
"lint:check": "eslint . && prettier --check .",
"lint:ci:eslint": "eslint --format github $(git diff --name-only origin/main HEAD | xargs)",
"prepare": "husky install",
"version": "yarn build:dev"
},
Expand Down
2 changes: 2 additions & 0 deletions site/vercel.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"installCommand": "cd .. && yarn install --ignore-engines",
"buildCommand": "cd .. && yarn build:site",
"redirects": [
{
"source": "/getting-started/setup",
Expand Down
6 changes: 5 additions & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,18 @@
"cache": false
},
"test": {
"env": ["VITEST_SEPOLIA_FORK_URL"],
"dependsOn": ["^build"],
"cache": false,
"persistent": true
},
"test:ci": {
"dependsOn": ["^build"]
"env": ["VITEST_SEPOLIA_FORK_URL"],
"dependsOn": ["^build"],
"cache": false
},
"docs:gen": {
"dependsOn": ["ak-docgen#build"],
"outputs": ["../../site/pages/reference/**"]
},
"generate": {
Expand Down
Loading