Skip to content

Commit

Permalink
Fix: server build
Browse files Browse the repository at this point in the history
  • Loading branch information
harshithmullapudi committed Feb 11, 2025
1 parent cf4a437 commit 4e2fa26
Show file tree
Hide file tree
Showing 10 changed files with 5,414 additions and 6,655 deletions.
1 change: 0 additions & 1 deletion apps/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"simple-git-hooks": "2.11.1",
"typescript": "5.6.2",
"typescript-eslint": "8.8.1",
"unplugin-auto-expose": "0.3.0",
"vite": "5.4.8",
"vitest": "2.1.2",
"vue": "3.5.11",
Expand Down
3 changes: 1 addition & 2 deletions apps/electron/packages/preload/vite.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {chrome} from '../../.electron-vendors.cache.json';
import {preload} from 'unplugin-auto-expose';
import {join} from 'node:path';

const PACKAGE_ROOT = __dirname;
Expand Down Expand Up @@ -35,7 +34,7 @@ const config = {
reportCompressedSize: false,
},

plugins: [preload.vite()],
plugins: [],
};

export default config;
8 changes: 4 additions & 4 deletions apps/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ COPY --from=pruner --chown=node:node /app/out/pnpm-workspace.yaml ./pnpm-workspa
FROM base AS dev-deps
WORKDIR /app
# Corepack is used to install pnpm
RUN corepack enable && corepack prepare pnpm@9.15.5 --activate
RUN npm install -g pnpm
ENV NODE_ENV development
RUN pnpm install --ignore-scripts --no-frozen-lockfile

## Production deps
FROM base AS production-deps
WORKDIR /app
# Corepack is used to install pnpm
RUN corepack enable && corepack prepare pnpm@9.15.5 --activate
RUN npm install -g pnpm
ENV NODE_ENV production
RUN pnpm install --prod --no-frozen-lockfile
COPY --from=pruner --chown=node:node /app/apps/server/prisma/schema.prisma /app/apps/server/prisma/schema.prisma
Expand All @@ -36,7 +36,7 @@ ENV NPM_CONFIG_IGNORE_WORKSPACE_ROOT_CHECK true
FROM base AS builder
WORKDIR /app
# Corepack is used to install pnpm
RUN corepack enable && corepack prepare pnpm@9.15.5 --activate
RUN npm install -g pnpm

COPY --from=pruner --chown=node:node /app/out/full/ .
COPY --from=dev-deps --chown=node:node /app/ .
Expand All @@ -52,7 +52,7 @@ RUN apk update \
&& rm -rf /var/cache/apk/*
RUN apk add --no-cache dumb-init bash
WORKDIR /app
RUN corepack enable && corepack prepare pnpm@9.15.5 --activate
RUN npm install -g pnpm
ENV NODE_ENV production

COPY --from=pruner --chown=node:node /app/out/full/ .
Expand Down
1 change: 0 additions & 1 deletion apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
"@qdrant/js-client-rest": "^1.12.0",
"@sigma/editor-extensions": "workspace:*",
"@sigma/types": "workspace:*",
"@tiptap/html": "^2.10.3",
"@trigger.dev/sdk": "3.3.13",
"@types/multer": "^1.4.11",
"@types/turndown": "^5.0.5",
Expand Down
11 changes: 5 additions & 6 deletions apps/server/src/modules/pages/pages.service.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
import { TiptapTransformer } from '@hocuspocus/transformer';
import { Injectable } from '@nestjs/common';
import {
convertHtmlToTiptapJson,
convertTiptapJsonToHtml,
tiptapExtensions,
} from '@sigma/editor-extensions';
import {
CreatePageDto,
GetPageByTitleDto,
Expand All @@ -9,12 +14,6 @@ import {
import { PrismaService } from 'nestjs-prisma';
import * as Y from 'yjs';

import {
convertHtmlToTiptapJson,
convertTiptapJsonToHtml,
tiptapExtensions,
} from 'common/utils/tiptap.utils';

import { PageSelect } from './pages.interface';

@Injectable()
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"typescript": "^5.4.5",
"zod": "3.23.8"
},
"packageManager": "pnpm@8.15.6",
"packageManager": "pnpm@9.15.5+sha512.845196026aab1cc3f098a0474b64dfbab2afe7a1b4e91dd86895d8e4aa32a7a6d03049e2d0ad770bbe4de023a7122fb68c1a1d6e0d033c7076085f9d5d4800d4",
"engines": {
"node": ">=18"
}
Expand Down
21 changes: 20 additions & 1 deletion packages/editor-extensions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,31 @@
},
"dependencies": {
"@tiptap/core": "^2.3.0",
"@tiptap/extension-blockquote": "^2.11.5",
"@tiptap/extension-bullet-list": "^2.11.5",
"@tiptap/extension-code-block": "^2.11.5",
"@tiptap/extension-code-block-lowlight": "^2.11.5",
"@tiptap/extension-collaboration": "^2.8.0",
"@tiptap/extension-collaboration-cursor": "^2.8.0",
"@tiptap/extension-document": "^2.11.5",
"@tiptap/extension-hard-break": "^2.11.5",
"@tiptap/extension-heading": "^2.11.5",
"@tiptap/extension-horizontal-rule": "^2.11.5",
"@tiptap/extension-image": "^2.11.5",
"@tiptap/extension-link": "^2.11.5",
"@tiptap/extension-list-item": "^2.11.5",
"@tiptap/extension-mention": "^2.10.3",
"@tiptap/extension-ordered-list": "^2.11.5",
"@tiptap/extension-paragraph": "^2.11.5",
"@tiptap/extension-task-item": "^2.11.5",
"@tiptap/extension-task-list": "^2.11.5",
"@tiptap/extension-text": "^2.11.5",
"@tiptap/extension-underline": "^2.11.5",
"@tiptap/html": "^2.10.3",
"@tiptap/react": "^2.5.4",
"lowlight": "^3.3.0"
"add": "^2.0.6",
"lowlight": "^3.3.0",
"pnpm": "^10.3.0"
},
"exports": {
".": {
Expand Down
1 change: 1 addition & 0 deletions packages/editor-extensions/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './editor-extensions';
export * from './tiptap.utils'
Loading

0 comments on commit 4e2fa26

Please sign in to comment.