From 73afd42d9e07275352ba9c899d30e322b51dd115 Mon Sep 17 00:00:00 2001 From: Guillaume Dorce Date: Fri, 26 May 2023 15:11:31 +0200 Subject: [PATCH] fix config for docker and import in getServerSideProps --- Dockerfile | 8 ++++---- src/pages/test-pb.tsx | 2 +- src/pages/test/[slug].tsx | 2 +- src/pages/test/list-pages.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index def6348..5a259cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,17 +18,17 @@ RUN \ ##### BUILDER FROM --platform=linux/amd64 node:16-alpine3.17 AS builder -ARG PB_API WORKDIR /app COPY --from=deps /app/node_modules ./node_modules COPY . . ENV NEXT_TELEMETRY_DISABLED 1 +ENV SKIP_ENV_VALIDATION 1 RUN \ - if [ -f yarn.lock ]; then SKIP_ENV_VALIDATION=1 yarn build; \ - elif [ -f package-lock.json ]; then SKIP_ENV_VALIDATION=1 npm run build; \ - elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && SKIP_ENV_VALIDATION=1 pnpm run build; \ + if [ -f yarn.lock ]; then yarn build; \ + elif [ -f package-lock.json ]; then npm run build; \ + elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm run build; \ else echo "Lockfile not found." && exit 1; \ fi diff --git a/src/pages/test-pb.tsx b/src/pages/test-pb.tsx index c2a6a8f..2f91aaf 100644 --- a/src/pages/test-pb.tsx +++ b/src/pages/test-pb.tsx @@ -1,5 +1,4 @@ import Layout from "@/layouts/Home" -import { getPages } from "@/utils/pb" import type { PagesRecord } from "@/@types/pocketbase-types" export default function Test({ json }: { json: PagesRecord[]}) { @@ -18,6 +17,7 @@ export default function Test({ json }: { json: PagesRecord[]}) { } export async function getServerSideProps() { + const { getPages } = await import("@/utils/pb") const {data, error} = await getPages(); if (error || !data) { diff --git a/src/pages/test/[slug].tsx b/src/pages/test/[slug].tsx index e38c964..afda2c2 100644 --- a/src/pages/test/[slug].tsx +++ b/src/pages/test/[slug].tsx @@ -1,6 +1,5 @@ import type { PagesRecord } from '@/@types/pocketbase-types'; import Layout from '@/layouts/Home' -import { getPageBySlug } from '@/utils/pb' function parseBoldText(text: string) { const parts = text.split(/(.*?<\/b>)/g); @@ -86,6 +85,7 @@ export default function Page({ data }: { slug: string, data: PagesRecord