Skip to content

Commit

Permalink
Merge pull request #11 from Indie-Creator-Community/chore/update-work…
Browse files Browse the repository at this point in the history
…space-deps

Chore/update workspace deps
  • Loading branch information
serudda authored Sep 21, 2024
2 parents 7501810 + 8712dff commit 69188b6
Show file tree
Hide file tree
Showing 8 changed files with 235 additions and 278 deletions.
31 changes: 13 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,24 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Setup pnpm
uses: pnpm/[email protected]
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Node 18
uses: actions/setup-node@v3
- name: Setup Node.js (v20.13.1)
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20.13.1

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
- name: Setup pnpm
uses: pnpm/action-setup@v3

- name: Setup pnpm cache
uses: actions/cache@v3
- name: Cache pnpm Store
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
path: ~/.pnpm-store
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: ${{ runner.os }}-pnpm-

- name: Install deps (with cache)
run: pnpm install
Expand Down
8 changes: 4 additions & 4 deletions apps/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"with-env": "dotenv -e ../../.env.${NODE_ENV:-local} --"
},
"dependencies": {
"@acme/api": "^0.1.0",
"@acme/auth": "^0.1.0",
"@acme/db": "^0.1.0",
"@acme/api": "workspace:*",
"@acme/auth": "workspace:*",
"@acme/db": "workspace:*",
"@tanstack/react-query": "^4.29.2",
"@trpc/client": "^10.20.0",
"@trpc/next": "^10.20.0",
Expand All @@ -30,7 +30,7 @@
"zod": "^3.21.4"
},
"devDependencies": {
"@acme/eslint-config": "^0.1.0",
"@acme/eslint-config": "workspace:*",
"@types/node": "^18.15.11",
"@types/react": "^18.0.37",
"@types/react-dom": "^18.0.11",
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.0.0",
"private": true,
"engines": {
"node": ">=v18.16.0"
"node": ">=v20.13.1"
},
"packageManager": "pnpm@8.3.1",
"packageManager": "pnpm@9.9.0",
"scripts": {
"build": "turbo build",
"clean": "git clean -xdf node_modules",
Expand All @@ -25,11 +25,11 @@
"prepare": "npx husky install"
},
"dependencies": {
"@acme/eslint-config": "^0.1.0",
"@acme/eslint-config": "workspace:*",
"@commitlint/cli": "^17.4.4",
"@commitlint/config-conventional": "^17.4.4",
"@ianvs/prettier-plugin-sort-imports": "^3.7.2",
"@manypkg/cli": "^0.20.0",
"@manypkg/cli": "^0.21.4",
"@types/prettier": "^2.7.2",
"eslint": "^8.38.0",
"husky": "^8.0.3",
Expand All @@ -39,7 +39,7 @@
"prettier-plugin-tailwindcss": "^0.2.7",
"side-ui": "^0.15.1",
"tailwindcss-scrollbar": "^0.1.0",
"turbo": "^1.9.3",
"turbo": "^2.1.2",
"typescript": "^5.0.4"
}
}
6 changes: 3 additions & 3 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@acme/auth": "^0.1.0",
"@acme/db": "^0.1.0",
"@acme/auth": "workspace:*",
"@acme/db": "workspace:*",
"@trpc/client": "^10.20.0",
"@trpc/server": "^10.20.0",
"superjson": "1.9.1",
"zod": "^3.21.4"
},
"devDependencies": {
"@acme/eslint-config": "^0.1.0",
"@acme/eslint-config": "workspace:*",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@acme/db": "^0.1.0",
"@acme/db": "workspace:*",
"@next-auth/prisma-adapter": "^1.0.5",
"next": "^13.3.0",
"next-auth": "^4.22.0",
"react": "18.2.0",
"react-dom": "18.2.0"
},
"devDependencies": {
"@acme/eslint-config": "^0.1.0",
"@acme/eslint-config": "workspace:*",
"eslint": "^8.38.0",
"typescript": "^5.0.4"
}
Expand Down
Loading

0 comments on commit 69188b6

Please sign in to comment.