Skip to content

Commit

Permalink
Merge pull request #27 from tommyasai/dev
Browse files Browse the repository at this point in the history
Minor fixes
  • Loading branch information
tommyasai authored Sep 22, 2023
2 parents 854f10a + 132d8bd commit e060413
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 16 deletions.
12 changes: 3 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
open-pull-requests-limit: 0
interval: "weekly"
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: bahmutov/npm-install@v1
with:
useLockFile: false
install-command: npm install --legacy-peer-deps
install-command: npm install

- name: 🔬 Lint
run: npm run lint
Expand All @@ -48,7 +48,7 @@ jobs:
uses: bahmutov/npm-install@v1
with:
useLockFile: false
install-command: npm install --legacy-peer-deps
install-command: npm install

- name: 🔎 Type check
run: npm run typecheck --if-present
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM base AS deps
WORKDIR /myapp

ADD package.json package-lock.json ./
RUN npm install --production=false --legacy-peer-deps
RUN npm install --production=false

# Setup production node_modules
FROM base AS production-deps
Expand All @@ -22,7 +22,7 @@ WORKDIR /myapp

COPY --from=deps /myapp/node_modules /myapp/node_modules
ADD package.json package-lock.json ./
RUN npm prune --production --legacy-peer-deps
RUN npm prune --production

# Build the app
FROM base AS build
Expand Down
4 changes: 3 additions & 1 deletion app/models/post.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export async function getPosts() {

export async function getPost(slug: string) {
const post = await prisma.post.findUnique({ where: { slug } });
return post ? formatTimestampsInObject(post, ["createdAt", "updatedAt"]) : null
return post
? formatTimestampsInObject(post, ["createdAt", "updatedAt"])
: null;
}

export async function createPost(
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"typescript": "^5.1.6"
},
"engines": {
"node": ">=14.0.0"
"node": ">=18.0.0"
},
"prisma": {
"seed": "ts-node prisma/seed.ts"
Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

set -ex
npx prisma migrate deploy
npm install tsconfig-paths --legacy-peer-deps
npm install tsconfig-paths
npm run start

0 comments on commit e060413

Please sign in to comment.