Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25,656 changes: 13,294 additions & 12,362 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/hls/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@hcengineering/platform": "^0.7.17",
"@hcengineering/presentation": "^0.7.0",
"hls.js": "^1.5.20",
"plyr": "^3.7.8",
"plyr": "3.7.8",
"svelte": "^4.2.20"
},
"repository": "https://github.com/hcengineering/platform",
Expand Down
2 changes: 1 addition & 1 deletion packages/importer/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
extends: ['./node_modules/@hcengineering/platform-rig/profiles/default/eslint.config.json'],
extends: ['./node_modules/@hcengineering/platform-rig/profiles/node/eslint.config.json'],
parserOptions: {
tsconfigRootDir: __dirname,
project: './tsconfig.json'
Expand Down
3 changes: 2 additions & 1 deletion packages/importer/config/rig.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
"rigPackageName": "@hcengineering/platform-rig"
"rigPackageName": "@hcengineering/platform-rig",
"rigProfile": "node"
}
10 changes: 3 additions & 7 deletions packages/importer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,16 @@
"main": "lib/index.js",
"svelte": "src/index.ts",
"types": "types/index.d.ts",
"files": [
"lib/**/*",
"types/**/*",
"tsconfig.json"
],
"author": "Anticrm Platform Contributors",
"template": "@hcengineering/node-package",
"license": "EPL-2.0",
"scripts": {
"build": "compile",
"build:watch": "compile",
"test": "jest --passWithNoTests --silent",
"test": "jest --passWithNoTests --silent --forceExit",
"format": "format src",
"_phase:build": "compile transpile src",
"_phase:test": "jest --passWithNoTests --silent",
"_phase:test": "jest --passWithNoTests --silent --forceExit",
"_phase:format": "format src",
"_phase:validate": "compile validate"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/importer/src/docx/docx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
// limitations under the License.
//

import { MarkupNode, htmlToJSON } from '@hcengineering/text'
import { htmlToJSON, type MarkupNode } from '@hcengineering/text'
import { markupToMarkdown } from '@hcengineering/text-markdown'
import { mkdir, readdir, readFile, writeFile } from 'fs/promises'
import * as yaml from 'js-yaml'
import { basename, dirname, extname, join, relative } from 'path'
import { HulyControlledDocumentHeader, HulyDocumentTemplateHeader } from '../huly/huly'
import { type HulyControlledDocumentHeader, type HulyDocumentTemplateHeader } from '../huly/huly'

export interface DocumentConverterOptions {
outputPath: string
Expand Down
6 changes: 3 additions & 3 deletions packages/importer/src/docx/preprocessors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// limitations under the License.
//

import { AttrValue, MarkupNode, MarkupNodeType } from '@hcengineering/text'
import { dirname, join, relative } from 'path'
import { DocumentPreprocessorSpec, DocumentState } from './docx'
import documents from '@hcengineering/controlled-documents'
import { type AttrValue, type MarkupNode, MarkupNodeType } from '@hcengineering/text'
import { dirname, join, relative } from 'path'
import { type DocumentPreprocessorSpec, type DocumentState } from './docx'

const _addStubHeader: DocumentPreprocessorSpec<DocumentState['header']> = (converter, inputOptions) => {
return (document) => {
Expand Down
38 changes: 19 additions & 19 deletions packages/importer/src/huly/cards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,36 @@
// limitations under the License.
//

import { Attachment } from '@hcengineering/attachment'
import card, { Card, CardSpace, MasterTag, Tag } from '@hcengineering/card'
import { type Attachment } from '@hcengineering/attachment'
import card, { type Card, type CardSpace, type MasterTag, type Tag } from '@hcengineering/card'
import core, {
Association,
Attribute,
BlobType,
Class,
Doc,
Enum,
type Association,
type Attribute,
type BlobType,
type Class,
type Doc,
type Enum,
generateId,
Ref,
Relation,
Space
type Ref,
type Relation,
type Space
} from '@hcengineering/core'
import * as fs from 'fs'
import * as yaml from 'js-yaml'
import { contentType } from 'mime-types'
import * as path from 'path'
import { IntlString } from '@hcengineering/platform'
import { Logger } from '../importer/logger'
import { Props, UnifiedDoc, UnifiedFile, UnifiedMixin, UnifiedUpdate } from '../types'
import { UnifiedFormatParser } from './parser'
import { AssociationMetadata, MetadataRegistry } from './registry'
import { type IntlString } from '@hcengineering/platform'
import { type Logger } from '../importer/logger'
import { type Props, type UnifiedDoc, type UnifiedFile, type UnifiedMixin, type UnifiedUpdate } from '../types'
import { type UnifiedFormatParser } from './parser'
import { type AssociationMetadata, type MetadataRegistry } from './registry'
import {
AssociationSchema,
BaseFieldType,
type BaseFieldType,
BooleanFieldType,
EnumSchema,
FieldType,
FormatSchema,
type FieldType,
type FormatSchema,
MasterTagSchema,
NumberFieldType,
OneOfFieldType,
Expand Down
27 changes: 17 additions & 10 deletions packages/importer/src/huly/huly.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,24 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { type Attachment } from '@hcengineering/attachment'
import card from '@hcengineering/card'
import contact, { Employee, type Person } from '@hcengineering/contact'
import contact, { type Employee, type Person } from '@hcengineering/contact'
import documents, {
ControlledDocument,
DocumentCategory,
DocumentMeta,
type ControlledDocument,
type DocumentCategory,
type DocumentMeta,
DocumentState
} from '@hcengineering/controlled-documents'
import { AccountUuid, generateId, PersonId, type Ref, SocialIdType, type TxOperations } from '@hcengineering/core'
import {
type AccountUuid,
generateId,
type PersonId,
type Ref,
SocialIdType,
type TxOperations
} from '@hcengineering/core'
import document, { type Document } from '@hcengineering/document'
import core from '@hcengineering/model-core'
import tracker, { type Issue, Project } from '@hcengineering/tracker'
import tracker, { type Issue, type Project } from '@hcengineering/tracker'
import * as fs from 'fs'
import sizeOf from 'image-size'
import * as yaml from 'js-yaml'
Expand All @@ -35,12 +42,12 @@ import { ImportWorkspaceBuilder } from '../importer/builder'
import {
type ImportAttachment,
type ImportComment,
ImportControlledDocument,
ImportControlledDocumentTemplate,
type ImportControlledDocument,
type ImportControlledDocumentTemplate,
type ImportDocument,
ImportDrawing,
type ImportDrawing,
type ImportIssue,
ImportOrgSpace,
type ImportOrgSpace,
type ImportProject,
type ImportProjectType,
type ImportTeamspace,
Expand Down
4 changes: 2 additions & 2 deletions packages/importer/src/huly/preprocessor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { Attachment } from '@hcengineering/attachment'
import { type Attachment } from '@hcengineering/attachment'
import { type Person } from '@hcengineering/contact'
import { type Class, type Doc, type Ref, type Space } from '@hcengineering/core'
import { MarkupMarkType, type MarkupNode, MarkupNodeType, traverseNode, traverseNodeMarks } from '@hcengineering/text'
Expand All @@ -21,7 +21,7 @@ import { contentType } from 'mime-types'
import * as path from 'path'
import { type Logger } from '../importer/logger'
import { BaseMarkdownPreprocessor } from '../importer/preprocessor'
import { MentionMetadata, MetadataRegistry } from './registry'
import { type MentionMetadata, type MetadataRegistry } from './registry'

export interface AttachmentMetadata {
id: Ref<Attachment>
Expand Down
13 changes: 10 additions & 3 deletions packages/importer/src/huly/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@
// limitations under the License.
//

import { Tag } from '@hcengineering/card'
import { Association, Attribute, Blob as PlatformBlob, Doc, generateId, Ref } from '@hcengineering/core'
import { UnifiedDoc } from '../types'
import { type Tag } from '@hcengineering/card'
import {
type Association,
type Attribute,
type Blob as PlatformBlob,
type Doc,
generateId,
type Ref
} from '@hcengineering/core'
import { type UnifiedDoc } from '../types'
import { v4 as uuid } from 'uuid'

export interface AssociationMetadata {
Expand Down
2 changes: 1 addition & 1 deletion packages/importer/src/huly/validation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FormatSchema, BaseFieldType, FieldType } from './schema'
import { type FormatSchema, type BaseFieldType, type FieldType } from './schema'

type Field = Record<string, any>

Expand Down
8 changes: 4 additions & 4 deletions packages/importer/src/importer/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
import documents, { ControlledDocument, DocumentState } from '@hcengineering/controlled-documents'
import documents, { type ControlledDocument, DocumentState } from '@hcengineering/controlled-documents'
import { type DocumentQuery, type Ref, type Status, type TxOperations } from '@hcengineering/core'
import document from '@hcengineering/document'
import tracker, { IssuePriority, type IssueStatus } from '@hcengineering/tracker'
import {
ImportControlledDocument,
ImportControlledDocumentTemplate,
ImportOrgSpace,
type ImportControlledDocument,
type ImportControlledDocumentTemplate,
type ImportOrgSpace,
type ImportControlledDocOrTemplate,
type ImportDocument,
type ImportIssue,
Expand Down
4 changes: 2 additions & 2 deletions packages/importer/src/importer/frontUploader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import {
type CollaborativeDoc,
concatLink,
makeCollabJsonId,
Markup,
type Markup,
type Blob as PlatformBlob,
type Ref
} from '@hcengineering/core'
import { FileUploader, UploadResult } from './uploader'
import { type FileUploader, type UploadResult } from './uploader'

interface FileUploadError {
key: string
Expand Down
26 changes: 13 additions & 13 deletions packages/importer/src/importer/importer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
import attachment, { type Attachment, Drawing } from '@hcengineering/attachment'
import attachment, { type Attachment, type Drawing } from '@hcengineering/attachment'
import chunter, { type ChatMessage } from '@hcengineering/chunter'
import { Employee, type Person } from '@hcengineering/contact'
import { type Employee, type Person } from '@hcengineering/contact'
import documents, {
ChangeControl,
type ChangeControl,
type ControlledDocument,
createControlledDocMetadata,
createDocumentTemplateMetadata,
DocumentCategory,
DocumentMeta,
type DocumentCategory,
type DocumentMeta,
type DocumentSpace,
DocumentState,
DocumentTemplate,
OrgSpace,
ProjectDocument,
type DocumentState,
type DocumentTemplate,
type OrgSpace,
type ProjectDocument,
useDocumentTemplate
} from '@hcengineering/controlled-documents'
import core, {
type AttachedData,
AttachedDoc,
type AttachedDoc,
type Class,
type CollaborativeDoc,
type Data,
Expand All @@ -42,7 +42,7 @@ import core, {
type Mixin,
type Blob as PlatformBlob,
type Ref,
RolesAssignment,
type RolesAssignment,
SortingOrder,
type Space,
type Status,
Expand Down Expand Up @@ -70,8 +70,8 @@ import tracker, {
TimeReportDayType
} from '@hcengineering/tracker'
import view from '@hcengineering/view'
import { Props, UnifiedUpdate, UnifiedDoc, UnifiedFile, UnifiedMixin } from '../types'
import { Logger } from './logger'
import { type Props, type UnifiedUpdate, type UnifiedDoc, type UnifiedFile, type UnifiedMixin } from '../types'
import { type Logger } from './logger'
import { type MarkdownPreprocessor, NoopMarkdownPreprocessor } from './preprocessor'
import { type FileUploader } from './uploader'
export interface ImportWorkspace {
Expand Down
11 changes: 9 additions & 2 deletions packages/importer/src/importer/storageUploader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@
// limitations under the License.
//
import { saveCollabJson } from '@hcengineering/collaboration'
import { CollaborativeDoc, Markup, MeasureContext, Blob as PlatformBlob, Ref, WorkspaceIds } from '@hcengineering/core'
import {
type CollaborativeDoc,
type Markup,
type MeasureContext,
type Blob as PlatformBlob,
type Ref,
type WorkspaceIds
} from '@hcengineering/core'
import type { StorageAdapter } from '@hcengineering/server-core'
import { FileUploader, UploadResult } from './uploader'
import { type FileUploader, type UploadResult } from './uploader'

export class StorageFileUploader implements FileUploader {
constructor (
Expand Down
11 changes: 10 additions & 1 deletion packages/importer/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
import { Class, Data, Doc, Mixin, Ref, Space, Blob as PlatformBlob, DocumentUpdate } from '@hcengineering/core'
import {
type Class,
type Data,
type Doc,
type Mixin,
type Ref,
type Space,
type Blob as PlatformBlob,
type DocumentUpdate
} from '@hcengineering/core'
export type Props<T extends Doc> = Data<T> & Partial<Doc> & { space: Ref<Space> }

export interface UnifiedDoc<T extends Doc> {
Expand Down
2 changes: 1 addition & 1 deletion packages/importer/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./node_modules/@hcengineering/platform-rig/profiles/default/tsconfig.json",
"extends": "./node_modules/@hcengineering/platform-rig/profiles/node/tsconfig.json",

"compilerOptions": {
"rootDir": "./src",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"emojibase-regex": "^16.0.0",
"fast-equals": "^5.2.2",
"svelte": "^4.2.20",
"plyr": "^3.7.8",
"plyr": "3.7.8",
"blurhash": "^2.0.5"
},
"repository": "https://github.com/hcengineering/platform",
Expand Down
Loading
Loading