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: remove monorepo relics #1710

Merged
merged 2 commits into from
Oct 4, 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
5 changes: 1 addition & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ on:
workflow_dispatch:

env:
CI: true
NODE_OPTIONS: --max-old-space-size=8192
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
TURBO_FORCE: false

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -48,8 +47,6 @@ jobs:
env:
ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
ANVIL_BLOCK_NUMBER: ${{ matrix.block-number }}
DATABASE_URL: ${{ secrets.DATABASE_URL }}
REDIS_URL: ${{ secrets.REDIS_URL }}
EDGE_CONFIG: ${{ secrets.EDGE_CONFIG }}
NEXT_PUBLIC_APP_ENV: 'test'
NEXT_PUBLIC_CHAIN_ID: ${{ matrix.chain-id }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
workflow_call:
workflow_dispatch:
env:
NODE_OPTIONS: --max-old-space-size=8192
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

Expand Down
51 changes: 4 additions & 47 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# env
.env

# local env files
.env.local
.env.development.local
Expand All @@ -43,74 +46,28 @@ yarn-error.log*
# vercel
.vercel

# env
.env
skaffold.env

# mesh
.mesh

# graphql
.graphclient

# typechain
typechain

# exports
exports

# cache
cache

# generated
generated

# artifacts
artifacts

# artifacts zk
artifacts-zk

# cache zk
cache-zk

# workers
**/public/sw.js
**/public/workbox-*.js
**/public/worker-*.js
**/public/sw.js.map
**/public/workbox-*.js.map
**/public/worker-*.js.map

# prisma

# screenshots
screenshots

# playwright
playwright-report
test-results

# Sentry
.sentryclirc

test-results/
results/

# typescript
*.tsbuildinfo
next-env.d.ts

# storybook
storybook-static

# tines snapshots
test/snapshots/

# Sentry Config File
.env.sentry-build-plugin

# npm lock file (we use pnpm)
package-lock.json

# yarn lock file (we use pnpm)
yarn.lock
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

5 changes: 0 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
},
"typescript.tsdk": "apps/web/node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
Expand All @@ -50,9 +48,6 @@
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
},
"[solidity]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"yaml.schemas": {
"https://www.artillery.io/schema.json": [
"file:///home/feedme/sushi/sushiswap/apis/router/test/load.yml"
Expand Down
7 changes: 6 additions & 1 deletion apps/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Apps

...
The `apps` directory contains all the code for the different applications that are part of the project. Each application is a separate directory with its own `README.md` file.

## [Web](web/README.md)
## [Mobile](mobile/README.md)
## [Extension](extension/README.md)
## [Desktop](desktop/README.md)
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Badge, TooltipContent } from '@sushiswap/ui'
import { Tooltip, TooltipProvider, TooltipTrigger } from '@sushiswap/ui'
import { AptosCircle } from '@sushiswap/ui/icons/network/circle/AptosCircle'
import React, { FC } from 'react'
// import { ProtocolBadge } from 'src/ui/pool/PoolNameCell'
import { formatNumber } from 'sushi'
import { CurrencyIcon } from '~aptos/(common)/ui/currency/currency-icon'
import { CurrencyIconList } from '~aptos/(common)/ui/currency/currency-icon-list'
Expand Down
8 changes: 0 additions & 8 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,13 @@
"_types",
".turbo",
".next",
".mesh",
".graphclient",
".storybook",
"storybook-static",
"node_modules",
"**/node_modules",
"CHANGELOG.md",
"dist",
"artifacts",
"cache",
"coverage",
"deployments",
"test-results",
"test/contracts",
"typechain",
"tsconfig.json",
"tsconfig.*.json",
"packages/graph-client",
Expand Down
2 changes: 0 additions & 2 deletions config/nextjs/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ const defaultNextConfig = {
'@heroicons/react-v1/outline',
'@sushiswap/graph-client',
'@sushiswap/hooks',
'@sushiswap/router',
'@sushiswap/tines',
'@sushiswap/ui',
'sushi',
'date-fns',
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "sushi",
"version": "0.0.0",
"private": true,
"scripts": {
"build": "dotenv -- turbo run build",
Expand All @@ -13,8 +12,8 @@
"generate": "dotenv -- turbo run generate --no-cache --parallel --continue",
"lint": "biome check .",
"lint:fix": "biome check . --apply",
"sort": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json' 'protocols/*/package.json'",
"sort-check": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json' 'protocols/*/package.json' --check",
"sort": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json'",
"sort-check": "sort-package-json 'package.json' 'apis/*/package.json' 'apps/*/package.json' 'config/*/package.json' 'packages/*/package.json' --check",
"test": "dotenv -- turbo run test --parallel",
"test-web-app": "dotenv -- turbo run test --filter=web",
"web": "pnpm exec turbo run dev --filter web"
Expand All @@ -37,7 +36,6 @@
},
"pnpm": {
"overrides": {
"@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.13",
"graphql": "16.6.0",
"typescript": "5.5.4",
"@types/react": "18.2.14",
Expand Down
14 changes: 7 additions & 7 deletions packages/graph-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,21 @@
},
"dependencies": {
"@sushiswap/steer-sdk": "workspace:*",
"gql.tada": "^1.7.5",
"gql.tada": "1.7.5",
"graphql": "16.6.0",
"graphql-request": "^7.0.1",
"json-bigint": "^1.0.0",
"graphql-request": "7.1.0",
"json-bigint": "1.0.0",
"sushi": "4.0.5",
"viem": "2.21.4"
},
"devDependencies": {
"@0no-co/graphqlsp": "^1.12.3",
"@0no-co/graphqlsp": "1.12.3",
"@tsconfig/esm": "1.0.4",
"@tsconfig/strictest": "2.0.2",
"@types/json-bigint": "^1.0.4",
"@types/json-bigint": "1.0.4",
"@types/node": "20",
"tsc-alias": "^1.8.10",
"tsx": "^4.7.1",
"tsc-alias": "1.8.10",
"tsx": "4.19.0",
"typescript": "5.5.4"
}
}
2 changes: 1 addition & 1 deletion packages/notifications/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"dependencies": {
"@heroicons/react": "2.0.13",
"@sushiswap/ui": "workspace:*",
"idb": "^8.0.0",
"idb": "8.0.0",
"nanoid": "4.0.0",
"react-toastify": "9.1.3"
},
Expand Down
10 changes: 1 addition & 9 deletions packages/steer-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,19 @@
"dependencies": {
"@steerprotocol/contracts": "2.1.0-beta.14",
"sushi": "4.0.5",
"tslib": "latest",
"viem": "2.21.4"
},
"devDependencies": {
"@tsconfig/esm": "1.0.4",
"@tsconfig/strictest": "2.0.2",
"@types/node": "20",
"@wagmi/core": "2.13.5",
"next": "14.2.11",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.5.4"
},
"peerDependencies": {
"@wagmi/core": "2.13.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"wagmi": "2.12.10"
"react-dom": "18.2.0"
},
"peerDependenciesMeta": {
"react": {
Expand All @@ -81,8 +76,5 @@
"react-dom": {
"optional": true
}
},
"optionalDependencies": {
"next": "14.2.11"
}
}
2 changes: 2 additions & 0 deletions packages/sushiswap/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SushiSwap

10 changes: 10 additions & 0 deletions packages/sushiswap/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "sushiswap",
"version": "0.0.0",
"private": true,
"repository": {
"type": "git",
"url": "https://github.com/sushi-labs/sushiswap.git",
"directory": "packages/sushiswap"
}
}
Loading
Loading