diff --git a/apps/server/src/common/helpers/types/export-metadata.types.ts b/apps/server/src/common/helpers/types/export-metadata.types.ts index 4e02a4c2..42ef4c68 100644 --- a/apps/server/src/common/helpers/types/export-metadata.types.ts +++ b/apps/server/src/common/helpers/types/export-metadata.types.ts @@ -7,8 +7,8 @@ export type ExportPageMetadata = { }; export type ExportMetadata = { - version: number; exportedAt: string; source: 'docmost'; + version: string; pages: Record; }; diff --git a/apps/server/src/integrations/export/export.service.ts b/apps/server/src/integrations/export/export.service.ts index 6c136a61..44047174 100644 --- a/apps/server/src/integrations/export/export.service.ts +++ b/apps/server/src/integrations/export/export.service.ts @@ -29,6 +29,8 @@ import { Node } from '@tiptap/pm/model'; import { EditorState } from '@tiptap/pm/state'; // eslint-disable-next-line @typescript-eslint/no-require-imports import slugify = require('@sindresorhus/slugify'); +// eslint-disable-next-line @typescript-eslint/no-require-imports +const packageJson = require('../../../package.json'); import { EnvironmentService } from '../environment/environment.service'; import { getAttachmentIds, @@ -261,9 +263,9 @@ export class ExportService { } const metadata: ExportMetadata = { - version: 1, exportedAt: new Date().toISOString(), source: 'docmost', + version: packageJson.version, pages: pagesMetadata, }; diff --git a/apps/server/src/integrations/import/utils/import.utils.ts b/apps/server/src/integrations/import/utils/import.utils.ts index 53c1bc4a..cd348652 100644 --- a/apps/server/src/integrations/import/utils/import.utils.ts +++ b/apps/server/src/integrations/import/utils/import.utils.ts @@ -98,11 +98,7 @@ export async function readDocmostMetadata( try { const content = await fs.readFile(metadataPath, 'utf-8'); const metadata = JSON.parse(content) as ExportMetadata; - if ( - metadata.source === 'docmost' && - metadata.version === 1 && - metadata.pages - ) { + if (metadata.source === 'docmost' && metadata.pages) { return metadata; } return null;