Skip to content

Commit

Permalink
- Upgraded node, pnpm, and flyctl versions
Browse files Browse the repository at this point in the history
- Upgraded packages
- Formatted
  • Loading branch information
michaelschwobe committed Nov 18, 2023
1 parent ebd68f2 commit 08bd6fe
Show file tree
Hide file tree
Showing 11 changed files with 637 additions and 637 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
# If changing these, match the same values from:
# - `/Dockerfile`
# - `/package.json`
node-version: [21.1.0]
pnpm-version: [8.10.2]
node-version: [21.2.0]
pnpm-version: [8.10.5]
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
# If changing these, match the same values from:
# - `/Dockerfile`
# - `/package.json`
node-version: [21.1.0]
pnpm-version: [8.10.2]
node-version: [21.2.0]
pnpm-version: [8.10.5]
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:
# If changing these, match the same values from:
# - `/Dockerfile`
# - `/package.json`
node-version: [21.1.0]
pnpm-version: [8.10.2]
node-version: [21.2.0]
pnpm-version: [8.10.5]
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -130,8 +130,8 @@ jobs:
# If changing these, match the same values from:
# - `/Dockerfile`
# - `/package.json`
node-version: [21.1.0]
pnpm-version: [8.10.2]
node-version: [21.2.0]
pnpm-version: [8.10.5]
steps:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
matrix:
# If changing this, match the same value from:
# - Running `flyctl version` on your local machine
flyctl-version: [0.1.118]
flyctl-version: [0.1.127]
if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
steps:
- name: ⬇️ Checkout repo
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# If changing this, match the same values from:
# - `/.github/workflows/deploy.yml`
# - `/package.json`
ARG NODE_VERSION=21.1.0
ARG NODE_VERSION=21.2.0
FROM node:${NODE_VERSION}-slim as base

LABEL fly_launch_runtime="Remix/Prisma"
Expand All @@ -19,7 +19,7 @@ ENV NODE_ENV="production"
# If changing this, match the same values from:
# - `/.github/workflows/deploy.yml`
# - `/package.json`
ARG PNPM_VERSION=8.10.2
ARG PNPM_VERSION=8.10.5
RUN npm install -g pnpm@$PNPM_VERSION


Expand Down
4 changes: 2 additions & 2 deletions app/components/button-column-sort.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export const ButtonColumnSort = forwardRef<
isSortedAsc
? "chevron-up"
: isSortedDesc
? "chevron-down"
: "chevrons-up-down"
? "chevron-down"
: "chevrons-up-down"
}
/>
</Button>
Expand Down
4 changes: 2 additions & 2 deletions app/components/button-favorite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export const ButtonFavorite = forwardRef<
const verb = isMultiple
? "(Un)favorite"
: isFavorited
? "Unfavorite"
: "Favorite";
? "Unfavorite"
: "Favorite";
const text = label ? `${verb} ${label}` : verb;

return (
Expand Down
4 changes: 2 additions & 2 deletions app/components/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ export const HeaderNavButtonTheme = ({
currTheme === "system"
? "light"
: currTheme === "light"
? "dark"
: "system";
? "dark"
: "system";
const { icon, text } = THEME_ICON_AND_TEXT_MAP[currTheme];

return (
Expand Down
4 changes: 2 additions & 2 deletions app/components/table-columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ export const columnBookmarkStatus = createColumnHelper<{
row.original._meta.ok === true
? "success"
: getValue() >= 300 && getValue() <= 499
? "warning"
: "danger"
? "warning"
: "danger"
}
>
{getValue()}
Expand Down
4 changes: 2 additions & 2 deletions app/components/ui/toast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ export const Toast = forwardRef<React.ElementRef<"div">, ToastProps>(
variant === "error"
? "alert-triangle"
: variant === "success"
? "check"
: "info"
? "check"
: "info"
}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/utils/client-hints.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ export function getClientHints(request?: Request) {
typeof document !== "undefined"
? document.cookie
: typeof request !== "undefined"
? request.headers.get("Cookie") ?? ""
: "";
? request.headers.get("Cookie") ?? ""
: "";

return Object.entries(clientHints).reduce(
(acc, [name, hint]) => {
Expand Down
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@
"validate": "pnpm run typecheck && pnpm run lint && pnpm run coverage && pnpm run e2e"
},
"dependencies": {
"@conform-to/react": "^0.9.0",
"@conform-to/zod": "^0.9.0",
"@conform-to/react": "^0.9.1",
"@conform-to/zod": "^0.9.1",
"@paralleldrive/cuid2": "^2.2.2",
"@prisma/client": "^5.5.2",
"@prisma/client": "^5.6.0",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-select": "^1.2.2",
"@remix-run/css-bundle": "^2.2.0",
"@remix-run/node": "^2.2.0",
"@remix-run/react": "^2.2.0",
"@remix-run/serve": "^2.2.0",
"@remix-run/css-bundle": "^2.3.0",
"@remix-run/node": "^2.3.0",
"@remix-run/react": "^2.3.0",
"@remix-run/serve": "^2.3.0",
"@tanstack/react-table": "^8.10.7",
"bcryptjs": "^2.4.3",
"class-variance-authority": "^0.7.0",
"clsx": "^2.0.0",
"cookie": "^0.5.0",
"dotenv": "^16.3.1",
"happy-dom": "^12.10.3",
"isbot": "^3.7.0",
"prisma": "^5.5.2",
"isbot": "^3.7.1",
"prisma": "^5.6.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sonner": "^1.2.0",
Expand All @@ -62,28 +62,28 @@
},
"devDependencies": {
"@flydotio/dockerfile": "^0.4.10",
"@playwright/test": "^1.39.0",
"@remix-run/dev": "^2.2.0",
"@remix-run/eslint-config": "^2.2.0",
"@playwright/test": "^1.40.0",
"@remix-run/dev": "^2.3.0",
"@remix-run/eslint-config": "^2.3.0",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/container-queries": "^0.1.1",
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.0.0",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.1",
"@total-typescript/ts-reset": "^0.4.2",
"@types/bcryptjs": "^2.4.6",
"@types/cookie": "^0.5.4",
"@types/node": "^20.8.10",
"@types/react": "^18.2.36",
"@types/react-dom": "^18.2.14",
"@vitejs/plugin-react": "^4.1.1",
"@types/node": "^20.9.1",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@vitejs/plugin-react": "^4.2.0",
"@vitest/coverage-v8": "^0.34.6",
"@vitest/ui": "^0.34.6",
"eslint": "^8.53.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"prettier": "^3.0.3",
"prettier": "^3.1.0",
"prettier-plugin-tailwindcss": "^0.4.1",
"tailwindcss": "^3.3.5",
"tsx": "^3.14.0",
Expand All @@ -93,8 +93,8 @@
"vitest": "^0.34.6"
},
"engines": {
"node": ">=21.1.0",
"node": ">=21.2.0",
"pnpm": ">=8.10.2"
},
"packageManager": "[email protected].2"
"packageManager": "[email protected].5"
}
Loading

0 comments on commit 08bd6fe

Please sign in to comment.