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.

Sign up for GitHub

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

Jump to bottom

build: fix dockerfile and bring back turbo #2582

Merged
merged 5 commits into from
Jul 22, 2024
Merged

build: fix dockerfile and bring back turbo #2582

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d63fd07
fix: run build packages in docker
segunadebayo Jul 22, 2024
9e7cdcf
chore: bring back turbo to fix watch command
segunadebayo Jul 22, 2024
aa23843
revert: docker file
segunadebayo Jul 22, 2024
e0d3b60
chore: update turbo
segunadebayo Jul 22, 2024
a6cdff4
Merge branch 'main' into fix/pnpm
tomiir Jul 22, 2024
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
31 changes: 15 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@
"private": true,
"type": "module",
"scripts": {
"build:clean": "pnpm --if-present -r clean",
"build": "pnpm --if-present --workspace-concurrency=30 -r build",
"watch": "pnpm --if-present --workspace-concurrency=50 -r watch",
"gallery": "pnpm --filter=./apps/gallery dev",
"laboratory": "pnpm --filter=./apps/laboratory dev",
"demo": "pnpm --filter=./apps/gallery dev",
"examples": "pnpm --filter=./examples -r dev",
"build:packages": "pnpm --filter=./packages/* build",
"build:gallery": "pnpm build:packages; pnpm --filter=./apps/gallery build",
"build:laboratory": "pnpm build:packages; pnpm --filter=./apps/laboratory build",
"build:demo": "pnpm build:packages; pnpm --filter=./apps/demo build",
"build:examples": "pnpm build:packages; pnpm --filter=./examples -r build",
"test": "pnpm -r test --if-present",
"build:clean": "turbo run build:clean --filter={./packages/*}",
"build": "turbo run build --filter={./packages/*} --concurrency=30",
"watch": "turbo run watch --filter={./packages/*} --concurrency=50 --continue",
"gallery": "turbo run dev --filter={./apps/gallery}",
"laboratory": "turbo run dev --filter={./apps/laboratory}",
"demo": "turbo run dev --filter={./apps/demo}",
"examples": "turbo run dev --filter={./examples/*}",
"build:gallery": "pnpm build; pnpm --filter=./apps/gallery build",
"build:laboratory": "pnpm build; pnpm --filter=./apps/laboratory build",
"build:demo": "pnpm build; pnpm --filter=./apps/demo build",
"build:examples": "pnpm build; pnpm --filter=./examples -r build",
"test": "turbo run test",
"coverage:merge": "node ./scripts/coverage-merge.js",
"coverage:summary": "node ./scripts/coverage-summary.js",
"typecheck": "pnpm --if-present -r typecheck",
"lint": "pnpm -r lint",
"typecheck": "turbo run typecheck",
"lint": "turbo run lint",
"danger": "danger ci",
"prettier": "prettier --check .",
"prettier:format": "prettier --write .",
Expand All @@ -45,7 +44,7 @@
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-require-extensions": "0.1.3",
"prettier": "3.1.1",
"turbo": "1.11.3",
"turbo": "2.0.6-canary.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is only version of turbo that supports PNPM 9

Copy link
Contributor

@enesozturk enesozturk Jul 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Wow really? Not the 2.0.9 supporting it as I see it's the latest? Is there any ref? @segunadebayo

"typescript": "5.3.3",
"vite": "5.2.11",
"vitest": "1.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cdn/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc && vite build",
"watch": "npx tsc --watch",
"upload": "pnpm build && pnpm publish --public"
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/ethers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
},
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/ethers5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
},
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/polyfills/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold-ui/src/views/w3m-connecting-external-view/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import {
RouterController,
StorageUtil
} from '@web3modal/core'
import { ConstantsUtil } from '@web3modal/scaffold-utils'
import { customElement } from '@web3modal/ui'
import { W3mConnectingWidget } from '../../utils/w3m-connecting-widget/index.js'
import { ConstantsUtil } from '@web3modal/scaffold-utils'

@customElement('w3m-connecting-external-view')
export class W3mConnectingExternalView extends W3mConnectingWidget {
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
},
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold-vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/scaffold/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/siwe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/solana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
},
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"test": "vitest run --dir tests --coverage.enabled --reporter=junit --coverage.reporter=json-summary --coverage.reporter=html",
Expand Down
2 changes: 1 addition & 1 deletion packages/wagmi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
},
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"!tsconfig.tsbuildinfo"
],
"scripts": {
"clean": "rm -rf dist",
"build:clean": "rm -rf dist",
"build": "tsc --build",
"watch": "tsc --watch",
"typecheck": "tsc --noEmit",
Expand Down
58 changes: 29 additions & 29 deletions pnpm-lock.yaml
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://turbo.build/schema.json",
"pipeline": {
"tasks": {
"build:clean": {
"outputs": ["dist/**"],
"cache": false
Expand Down Expand Up @@ -84,9 +84,9 @@
"cache": false
},
"build": {
"dependsOn": ["build:cdn"],
"dependsOn": ["^build"],
"cache": false,
"persistent": true
"outputs": ["dist/**"]
},
"build:gallery": {
"outputs": ["out/**"],
Expand Down
Loading