Skip to content

Commit

Permalink
- Upgraded flyctl/node/pnpm versions and packages
Browse files Browse the repository at this point in the history
- Added `remix-development-tools` package
  • Loading branch information
michaelschwobe committed Dec 9, 2023
1 parent ebceaf2 commit 609e18c
Show file tree
Hide file tree
Showing 7 changed files with 640 additions and 295 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.2.0]
pnpm-version: [8.11.0]
node-version: [21.4.0]
pnpm-version: [8.12.0]
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.2.0]
pnpm-version: [8.11.0]
node-version: [21.4.0]
pnpm-version: [8.12.0]
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.2.0]
pnpm-version: [8.11.0]
node-version: [21.4.0]
pnpm-version: [8.12.0]
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.2.0]
pnpm-version: [8.11.0]
node-version: [21.4.0]
pnpm-version: [8.12.0]
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.129]
flyctl-version: [0.1.132]
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.2.0
ARG NODE_VERSION=21.4.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.11.0
ARG PNPM_VERSION=8.12.0
RUN npm install -g pnpm@$PNPM_VERSION


Expand Down
13 changes: 12 additions & 1 deletion app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
ScrollRestoration,
useLoaderData,
} from "@remix-run/react";
import rdtStylesheetUrl from "remix-development-tools/index.css";
import { GeneralErrorBoundary } from "~/components/error-boundary";
import { Header } from "~/components/header";
import { Landmark } from "~/components/ui/landmark";
Expand Down Expand Up @@ -118,6 +119,9 @@ export const links: LinksFunction = () => {

/* styles */
{ rel: "stylesheet", href: tailwindStylesheetUrl },
...(process.env.NODE_ENV === "development"
? [{ rel: "stylesheet", href: rdtStylesheetUrl }]
: []),
...(cssBundleHref ? [{ rel: "stylesheet", href: cssBundleHref }] : []),
];
};
Expand Down Expand Up @@ -182,7 +186,7 @@ function Document({
);
}

export default function App() {
function App() {
const loaderData = useLoaderData<typeof loader>();
const theme = useTheme();

Expand All @@ -200,6 +204,13 @@ export default function App() {
);
}

let AppExport = App;
if (process.env.NODE_ENV === "development") {
const { withDevTools } = await import("remix-development-tools");
AppExport = withDevTools(AppExport);
}
export default AppExport;

export function ErrorBoundary() {
return (
<Document>
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@conform-to/react": "^0.9.1",
"@conform-to/zod": "^0.9.1",
"@paralleldrive/cuid2": "^2.2.2",
"@prisma/client": "^5.6.0",
"@prisma/client": "^5.7.0",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-select": "^2.0.0",
"@remix-run/css-bundle": "^2.3.1",
Expand All @@ -53,7 +53,7 @@
"dotenv": "^16.3.1",
"happy-dom": "^12.10.3",
"isbot": "^3.7.1",
"prisma": "^5.6.0",
"prisma": "^5.7.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sonner": "^1.2.4",
Expand All @@ -75,34 +75,35 @@
"@total-typescript/ts-reset": "^0.5.1",
"@types/bcryptjs": "^2.4.6",
"@types/cookie": "^0.6.0",
"@types/node": "^20.10.3",
"@types/node": "^20.10.4",
"@types/react": "^18.2.42",
"@types/react-dom": "^18.2.17",
"@vitejs/plugin-react": "^4.2.1",
"@vitest/coverage-v8": "^1.0.1",
"@vitest/ui": "^1.0.1",
"@vitest/coverage-v8": "^1.0.2",
"@vitest/ui": "^1.0.2",
"enforce-unique": "^1.2.0",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"knip": "^3.5.0",
"knip": "^3.6.1",
"msw": "^2.0.10",
"prettier": "^3.1.0",
"prettier-plugin-tailwindcss": "^0.5.7",
"prettier-plugin-tailwindcss": "^0.5.9",
"remix-development-tools": "^3.6.2",
"tailwindcss": "^3.3.6",
"tsx": "^4.6.2",
"typescript": "^5.3.2",
"vite": "^5.0.5",
"vite-tsconfig-paths": "^4.2.1",
"vitest": "^1.0.1"
"typescript": "^5.3.3",
"vite": "^5.0.7",
"vite-tsconfig-paths": "^4.2.2",
"vitest": "^1.0.2"
},
"engines": {
"node": ">=21.2.0",
"pnpm": ">=8.11.0"
"node": ">=21.4.0",
"pnpm": ">=8.12.0"
},
"msw": {
"workerDirectory": "public"
},
"packageManager": "pnpm@8.11.0",
"packageManager": "pnpm@8.12.0",
"prisma": {
"seed": "tsx prisma/seed.ts"
}
Expand Down
Loading

0 comments on commit 609e18c

Please sign in to comment.