diff --git a/src/frontend/Dockerfile b/src/frontend/Dockerfile index 19d9d59..f589e04 100644 --- a/src/frontend/Dockerfile +++ b/src/frontend/Dockerfile @@ -5,19 +5,18 @@ WORKDIR /home/frontend/ COPY ./package.json ./package.json COPY ./yarn.lock ./yarn.lock COPY ./apps/calendars/package.json ./apps/calendars/package.json -COPY ./packages/open-calendar/package.json ./packages/open-calendar/package.json + RUN yarn install --frozen-lockfile COPY .dockerignore ./.dockerignore # COPY ./.prettierrc.js ./.prettierrc.js #COPY ./packages/eslint-config-calendars ./packages/eslint-config-calendars -COPY ./packages/open-calendar ./packages/open-calendar + COPY ./apps/calendars ./apps/calendars # Build open-calendar package -WORKDIR /home/frontend/packages/open-calendar -RUN yarn build + WORKDIR /home/frontend ### ---- Front-end builder image ---- @@ -34,7 +33,7 @@ EXPOSE 3000 RUN yarn build-theme # Build open-calendar package if dist doesn't exist, then start dev server -CMD ["/bin/sh", "-c", "cd /home/frontend/packages/open-calendar && ([ -d dist ] || yarn build) && cd /home/frontend/apps/calendars && yarn dev"] +CMD ["/bin/sh", "-c", "cd /home/frontend/apps/calendars && yarn dev"] # Tilt will rebuild calendars target so, we dissociate calendars and calendars-builder # to avoid rebuilding the app at every changes. @@ -61,8 +60,8 @@ ARG DOCKER_USER USER ${DOCKER_USER} COPY --from=calendars-builder \ - /home/frontend/apps/calendars/out \ - /usr/share/nginx/html + /home/frontend/apps/calendars/out \ + /usr/share/nginx/html COPY ./apps/calendars/conf/default.conf /etc/nginx/conf.d COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint diff --git a/src/frontend/apps/calendars/next.config.ts b/src/frontend/apps/calendars/next.config.ts index 3cc9059..32bc264 100644 --- a/src/frontend/apps/calendars/next.config.ts +++ b/src/frontend/apps/calendars/next.config.ts @@ -1,5 +1,4 @@ import type { NextConfig } from "next"; -import path from "path"; const nextConfig: NextConfig = { output: "export", @@ -9,10 +8,7 @@ const nextConfig: NextConfig = { // Resolve workspace packages config.resolve.alias = { ...config.resolve.alias, - "open-dav-calendar": path.resolve( - __dirname, - "../../packages/open-calendar/dist/index.js" - ), + }; return config; }, diff --git a/src/frontend/apps/calendars/src/features/calendar/components/index.ts b/src/frontend/apps/calendars/src/features/calendar/components/index.ts index 1bd39d2..2618d5d 100644 --- a/src/frontend/apps/calendars/src/features/calendar/components/index.ts +++ b/src/frontend/apps/calendars/src/features/calendar/components/index.ts @@ -1,4 +1,3 @@ -export { CalendarList } from "./CalendarList"; -export { CalendarView } from "./CalendarView"; export { LeftPanel } from "./LeftPanel"; export { MiniCalendar } from "./MiniCalendar"; +export { AttendeesInput } from "./AttendeesInput";