diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 0295cdbeef..c36f96af5e 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -24,11 +24,11 @@ dependencies: specifier: ^8.4.1 version: 8.4.1 '@hocuspocus/provider': - specifier: ^2.9.0 - version: 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(yjs@13.6.12) + specifier: ^2.11.0 + version: 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(y-protocols@1.0.6)(yjs@13.6.12) '@hocuspocus/server': specifier: ^2.9.0 - version: 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(yjs@13.6.12) + version: 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(y-protocols@1.0.6)(yjs@13.6.12) '@hocuspocus/transformer': specifier: ^2.9.0 version: 2.11.2(@tiptap/pm@2.2.4)(y-prosemirror@1.2.2)(yjs@13.6.12) @@ -127,7 +127,7 @@ dependencies: version: file:projects/collaboration.tgz(esbuild@0.20.1)(ts-node@10.9.2) '@rush-temp/collaborator': specifier: file:./projects/collaborator.tgz - version: file:projects/collaborator.tgz(@tiptap/pm@2.2.4)(bufferutil@4.0.8)(prosemirror-model@1.19.4)(utf-8-validate@6.0.3) + version: file:projects/collaborator.tgz(@tiptap/pm@2.2.4)(bufferutil@4.0.8)(prosemirror-model@1.19.4)(utf-8-validate@6.0.3)(y-protocols@1.0.6) '@rush-temp/collaborator-client': specifier: file:./projects/collaborator-client.tgz version: file:projects/collaborator-client.tgz(ts-node@10.9.2) @@ -835,10 +835,16 @@ dependencies: version: file:projects/tests-sanity.tgz '@rush-temp/text': specifier: file:./projects/text.tgz - version: file:projects/text.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(ts-node@10.9.2)(utf-8-validate@6.0.3) + version: file:projects/text.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(ts-node@10.9.2)(utf-8-validate@6.0.3)(y-protocols@1.0.6) '@rush-temp/text-editor': specifier: file:./projects/text-editor.tgz - version: file:projects/text-editor.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(prosemirror-model@1.19.4)(ts-node@10.9.2)(utf-8-validate@6.0.3) + version: file:projects/text-editor.tgz(@types/node@20.11.19)(esbuild@0.20.1)(svelte@4.2.12)(ts-node@10.9.2) + '@rush-temp/text-editor-assets': + specifier: file:./projects/text-editor-assets.tgz + version: file:projects/text-editor-assets.tgz(esbuild@0.20.1)(ts-node@10.9.2) + '@rush-temp/text-editor-resources': + specifier: file:./projects/text-editor-resources.tgz + version: file:projects/text-editor-resources.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(prosemirror-model@1.19.4)(ts-node@10.9.2)(utf-8-validate@6.0.3) '@rush-temp/theme': specifier: file:./projects/theme.tgz version: file:projects/theme.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2) @@ -850,7 +856,7 @@ dependencies: version: file:projects/time-assets.tgz(esbuild@0.20.1)(ts-node@10.9.2) '@rush-temp/time-resources': specifier: file:./projects/time-resources.tgz - version: file:projects/time-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2) + version: file:projects/time-resources.tgz(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4)(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2) '@rush-temp/tool': specifier: file:./projects/tool.tgz version: file:projects/tool.tgz(bufferutil@4.0.8)(utf-8-validate@6.0.3) @@ -1456,10 +1462,10 @@ dependencies: version: 8.16.0(bufferutil@4.0.8)(utf-8-validate@6.0.3) y-prosemirror: specifier: ^1.2.1 - version: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) - y-websocket: - specifier: ^1.5.0 - version: 1.5.4(yjs@13.6.12) + version: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) + y-protocols: + specifier: ^1.0.6 + version: 1.0.6(yjs@13.6.12) yjs: specifier: ^13.5.52 version: 13.6.12 @@ -4256,7 +4262,7 @@ packages: lib0: 0.2.89 dev: false - /@hocuspocus/provider@2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(yjs@13.6.12): + /@hocuspocus/provider@2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(y-protocols@1.0.6)(yjs@13.6.12): resolution: {integrity: sha512-h6/2KZC8Z3Wz+rP17WQ5eqxdgtsq5JZ4iC72WSXdIOJn3RO4sv63ZvT+EWc4aA1YM7UVDBYVjdOjMtEYZF0Flg==} peerDependencies: y-protocols: ^1.0.6 @@ -4266,13 +4272,14 @@ packages: '@lifeomic/attempt': 3.0.3 lib0: 0.2.89 ws: 8.16.0(bufferutil@4.0.8)(utf-8-validate@6.0.3) + y-protocols: 1.0.6(yjs@13.6.12) yjs: 13.6.12 transitivePeerDependencies: - bufferutil - utf-8-validate dev: false - /@hocuspocus/server@2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(yjs@13.6.12): + /@hocuspocus/server@2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(y-protocols@1.0.6)(yjs@13.6.12): resolution: {integrity: sha512-/djaNUSS9vYmz5H/bformB9BXKVhSXS10WIURT1OqFLnN0dZnOB0gxL/IyGCZgXCNyiD8U03n7FIgad9MckV8g==} peerDependencies: y-protocols: ^1.0.6 @@ -4284,6 +4291,7 @@ packages: lib0: 0.2.89 uuid: 9.0.1 ws: 8.16.0(bufferutil@4.0.8)(utf-8-validate@6.0.3) + y-protocols: 1.0.6(yjs@13.6.12) yjs: 13.6.12 transitivePeerDependencies: - bufferutil @@ -4300,7 +4308,7 @@ packages: '@tiptap/core': 2.2.4(@tiptap/pm@2.2.4) '@tiptap/pm': 2.2.4 '@tiptap/starter-kit': 2.2.4(@tiptap/pm@2.2.4) - y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) + y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) yjs: 13.6.12 dev: false @@ -7008,7 +7016,7 @@ packages: y-prosemirror: ^1.2.1 dependencies: '@tiptap/core': 2.2.4(@tiptap/pm@2.2.4) - y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) + y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) dev: false /@tiptap/extension-collaboration@2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4)(y-prosemirror@1.2.2): @@ -7020,7 +7028,7 @@ packages: dependencies: '@tiptap/core': 2.2.4(@tiptap/pm@2.2.4) '@tiptap/pm': 2.2.4 - y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) + y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) dev: false /@tiptap/extension-document@2.2.4(@tiptap/core@2.2.4): @@ -8301,32 +8309,6 @@ packages: deprecated: Use your platform's native atob() and btoa() methods instead dev: false - /abstract-leveldown@6.2.3: - resolution: {integrity: sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - buffer: 5.7.1 - immediate: 3.3.0 - level-concat-iterator: 2.0.1 - level-supports: 1.0.1 - xtend: 4.0.2 - dev: false - optional: true - - /abstract-leveldown@6.3.0: - resolution: {integrity: sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - buffer: 5.7.1 - immediate: 3.3.0 - level-concat-iterator: 2.0.1 - level-supports: 1.0.1 - xtend: 4.0.2 - dev: false - optional: true - /accepts@1.3.8: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} engines: {node: '>= 0.6'} @@ -10003,16 +9985,6 @@ packages: engines: {node: '>=10'} dev: false - /deferred-leveldown@5.3.0: - resolution: {integrity: sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - abstract-leveldown: 6.2.3 - inherits: 2.0.4 - dev: false - optional: true - /define-data-property@1.1.4: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} @@ -10414,18 +10386,6 @@ packages: engines: {node: '>= 0.8'} dev: false - /encoding-down@6.3.0: - resolution: {integrity: sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - abstract-leveldown: 6.3.0 - inherits: 2.0.4 - level-codec: 9.0.2 - level-errors: 2.0.1 - dev: false - optional: true - /end-of-stream@1.4.4: resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==} dependencies: @@ -10463,15 +10423,6 @@ packages: hasBin: true dev: false - /errno@0.1.8: - resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==} - hasBin: true - requiresBuild: true - dependencies: - prr: 1.0.1 - dev: false - optional: true - /error-callsites@2.0.4: resolution: {integrity: sha512-V877Ch4FC4FN178fDK1fsrHN4I1YQIBdtjKrHh3BUHMnh3SMvwUVrqkaOgDpUuevgSNna0RBq6Ox9SGlxYrigA==} engines: {node: '>=6.x'} @@ -12323,12 +12274,6 @@ packages: engines: {node: '>= 4'} dev: false - /immediate@3.3.0: - resolution: {integrity: sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==} - requiresBuild: true - dev: false - optional: true - /immutable@4.3.5: resolution: {integrity: sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==} dev: false @@ -13621,107 +13566,6 @@ packages: webpack: 5.90.3(esbuild@0.20.1)(webpack-cli@5.1.4) dev: false - /level-codec@9.0.2: - resolution: {integrity: sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - buffer: 5.7.1 - dev: false - optional: true - - /level-concat-iterator@2.0.1: - resolution: {integrity: sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw==} - engines: {node: '>=6'} - requiresBuild: true - dev: false - optional: true - - /level-errors@2.0.1: - resolution: {integrity: sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - errno: 0.1.8 - dev: false - optional: true - - /level-iterator-stream@4.0.2: - resolution: {integrity: sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - inherits: 2.0.4 - readable-stream: 3.6.2 - xtend: 4.0.2 - dev: false - optional: true - - /level-js@5.0.2: - resolution: {integrity: sha512-SnBIDo2pdO5VXh02ZmtAyPP6/+6YTJg2ibLtl9C34pWvmtMEmRTWpra+qO/hifkUtBTOtfx6S9vLDjBsBK4gRg==} - requiresBuild: true - dependencies: - abstract-leveldown: 6.2.3 - buffer: 5.7.1 - inherits: 2.0.4 - ltgt: 2.2.1 - dev: false - optional: true - - /level-packager@5.1.1: - resolution: {integrity: sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - encoding-down: 6.3.0 - levelup: 4.4.0 - dev: false - optional: true - - /level-supports@1.0.1: - resolution: {integrity: sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - xtend: 4.0.2 - dev: false - optional: true - - /level@6.0.1: - resolution: {integrity: sha512-psRSqJZCsC/irNhfHzrVZbmPYXDcEYhA5TVNwr+V92jF44rbf86hqGp8fiT702FyiArScYIlPSBTDUASCVNSpw==} - engines: {node: '>=8.6.0'} - requiresBuild: true - dependencies: - level-js: 5.0.2 - level-packager: 5.1.1 - leveldown: 5.6.0 - dev: false - optional: true - - /leveldown@5.6.0: - resolution: {integrity: sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==} - engines: {node: '>=8.6.0'} - requiresBuild: true - dependencies: - abstract-leveldown: 6.2.3 - napi-macros: 2.0.0 - node-gyp-build: 4.1.1 - dev: false - optional: true - - /levelup@4.4.0: - resolution: {integrity: sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==} - engines: {node: '>=6'} - requiresBuild: true - dependencies: - deferred-leveldown: 5.3.0 - level-errors: 2.0.1 - level-iterator-stream: 4.0.2 - level-supports: 1.0.1 - xtend: 4.0.2 - dev: false - optional: true - /leven@3.1.0: resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} engines: {node: '>=6'} @@ -13920,12 +13764,6 @@ packages: yallist: 4.0.0 dev: false - /ltgt@2.2.1: - resolution: {integrity: sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==} - requiresBuild: true - dev: false - optional: true - /lz-string@1.5.0: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true @@ -14395,12 +14233,6 @@ packages: resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==} dev: false - /napi-macros@2.0.0: - resolution: {integrity: sha512-A0xLykHtARfueITVDernsAWdtIMbOJgKgcluwENp3AlsKN/PloyO10HtmoqnFAQAcxPkgZN7wdfPfEd0zNGxbg==} - requiresBuild: true - dev: false - optional: true - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: false @@ -14475,13 +14307,6 @@ packages: dev: false optional: true - /node-gyp-build@4.1.1: - resolution: {integrity: sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==} - hasBin: true - requiresBuild: true - dev: false - optional: true - /node-gyp-build@4.8.0: resolution: {integrity: sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==} hasBin: true @@ -15540,12 +15365,6 @@ packages: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} dev: false - /prr@1.0.1: - resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} - requiresBuild: true - dev: false - optional: true - /pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} dev: false @@ -18420,19 +18239,7 @@ packages: engines: {node: '>=0.4'} dev: false - /y-leveldb@0.1.2(yjs@13.6.12): - resolution: {integrity: sha512-6ulEn5AXfXJYi89rXPEg2mMHAyyw8+ZfeMMdOtBbV8FJpQ1NOrcgi6DTAcXof0dap84NjHPT2+9d0rb6cFsjEg==} - requiresBuild: true - peerDependencies: - yjs: ^13.0.0 - dependencies: - level: 6.0.1 - lib0: 0.2.89 - yjs: 13.6.12 - dev: false - optional: true - - /y-prosemirror@1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12): + /y-prosemirror@1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12): resolution: {integrity: sha512-hHdnIAhfa8mIoLWtTkMDb6RBzN3lye1QVkaZwVm58sledAA1zTl+yyEtgkrY/sdH6SaQL0rsLj61zHjgr5D0HQ==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} peerDependencies: @@ -18444,6 +18251,7 @@ packages: dependencies: lib0: 0.2.89 prosemirror-model: 1.19.4 + y-protocols: 1.0.6(yjs@13.6.12) yjs: 13.6.12 dev: false @@ -18457,22 +18265,6 @@ packages: yjs: 13.6.12 dev: false - /y-websocket@1.5.4(yjs@13.6.12): - resolution: {integrity: sha512-Y3021uy0anOIHqAPyAZbNDoR05JuMEGjRNI8c+K9MHzVS8dWoImdJUjccljAznc8H2L7WkIXhRHZ1igWNRSgPw==} - engines: {node: '>=16.0.0', npm: '>=8.0.0'} - hasBin: true - peerDependencies: - yjs: ^13.5.6 - dependencies: - lib0: 0.2.89 - lodash.debounce: 4.0.8 - y-protocols: 1.0.6(yjs@13.6.12) - yjs: 13.6.12 - optionalDependencies: - ws: 6.2.2 - y-leveldb: 0.1.2(yjs@13.6.12) - dev: false - /y18n@5.0.8: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} @@ -18858,7 +18650,7 @@ packages: dev: false file:projects/attachment-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-/zfMflWwjhIE2lQjSgooWTbDQpmePh1Nf3mDC4z+7Ni0f9stI9r/+GU+PLV5NWRcifqzDOXtsoQLmVN5mk6eiA==, tarball: file:projects/attachment-resources.tgz} + resolution: {integrity: sha512-mF2tlDyxapMhNMctw3bDd2lr7PI5S3gh/QMVEtFTIJuO03UEwIul29Xi0xlKWUH/afiSe9397lP3jbU0rm5OMg==, tarball: file:projects/attachment-resources.tgz} id: file:projects/attachment-resources.tgz name: '@rush-temp/attachment-resources' version: 0.0.0 @@ -19051,7 +18843,7 @@ packages: dev: false file:projects/bitrix-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-7+sjB7CobjE6aU0cYNZHHizO4UpYGsal9+ho6d/TeZ9rOvG0maYwa8BD5Csajaq9LwyXpwSkCT+n6UYhRw3QdQ==, tarball: file:projects/bitrix-resources.tgz} + resolution: {integrity: sha512-dAKVpSbYJlZ5ZAnuws8NmWolwj0iqy/VAUq+AAcSOev3PdhEdkfoCgoA7hlNyqIOhWkS0rSREri6yvnwcM2PZw==, tarball: file:projects/bitrix-resources.tgz} id: file:projects/bitrix-resources.tgz name: '@rush-temp/bitrix-resources' version: 0.0.0 @@ -19165,7 +18957,7 @@ packages: dev: false file:projects/board-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-B1FD0R1CZkeoLzWN8qokdx3MqJhTRqElDe8oeHfsLG4ZnKDt+1RgGgJ3FETB2hnNb0jJUgvqB14DhmjataHZxg==, tarball: file:projects/board-resources.tgz} + resolution: {integrity: sha512-3AQ7i1pscNPcOoTyyKeaQ7r15VZCLKHxPs12thLlrWqkwqWsoENUqEd2fpp5PK6sR8rHgm3jdFDR9Co40JUrwg==, tarball: file:projects/board-resources.tgz} id: file:projects/board-resources.tgz name: '@rush-temp/board-resources' version: 0.0.0 @@ -19272,7 +19064,7 @@ packages: dev: false file:projects/calendar-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-LuZcWlRxi4vnkWQBDMMJdfW4eCdwHSLcgRfijfaEC7E0W8t01cKTDed9xWDbNsEYOzw6l1K+g52hil4AQy2JGQ==, tarball: file:projects/calendar-resources.tgz} + resolution: {integrity: sha512-SvB1C/OQ6sWbkm0/K5jf3r4ePSa1a9a9Trl1T/qtry5Q0UGNKEsnhRhQuLQboVCIWevSOmQPA1DGTUAFtae4Gg==, tarball: file:projects/calendar-resources.tgz} id: file:projects/calendar-resources.tgz name: '@rush-temp/calendar-resources' version: 0.0.0 @@ -19382,7 +19174,7 @@ packages: dev: false file:projects/chunter-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-qCzlKX3W11R7GEpG6tcgu+HJl2jj3bEUu5XR1or7UwBpTuBP5pYOPHuse0qO4wTLzgoDo3irhOFQPA4HyCD97g==, tarball: file:projects/chunter-resources.tgz} + resolution: {integrity: sha512-exqE0lZdIDuK5lMtVBJqftuOAy+oOT7Jq2EcIzU23p2tZNM9ku9ACfA0yGxRu+y8FMcQ9W4Pve1yCivD45i5Aw==, tarball: file:projects/chunter-resources.tgz} id: file:projects/chunter-resources.tgz name: '@rush-temp/chunter-resources' version: 0.0.0 @@ -19588,13 +19380,13 @@ packages: - ts-node dev: false - file:projects/collaborator.tgz(@tiptap/pm@2.2.4)(bufferutil@4.0.8)(prosemirror-model@1.19.4)(utf-8-validate@6.0.3): + file:projects/collaborator.tgz(@tiptap/pm@2.2.4)(bufferutil@4.0.8)(prosemirror-model@1.19.4)(utf-8-validate@6.0.3)(y-protocols@1.0.6): resolution: {integrity: sha512-RHYlR+704EhdJDPooKU+D4BzSDC0Ov00TritI4GOFPnTBbbVkQHCWLqowr1om/rTE/lJ3oHTGPwMBkkfNvAkpw==, tarball: file:projects/collaborator.tgz} id: file:projects/collaborator.tgz name: '@rush-temp/collaborator' version: 0.0.0 dependencies: - '@hocuspocus/server': 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(yjs@13.6.12) + '@hocuspocus/server': 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(y-protocols@1.0.6)(yjs@13.6.12) '@hocuspocus/transformer': 2.11.2(@tiptap/pm@2.2.4)(y-prosemirror@1.2.2)(yjs@13.6.12) '@tiptap/core': 2.2.4(@tiptap/pm@2.2.4) '@tiptap/html': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) @@ -19625,7 +19417,7 @@ packages: ts-node: 10.9.2(@types/node@20.11.19)(typescript@5.3.3) typescript: 5.3.3 ws: 8.16.0(bufferutil@4.0.8)(utf-8-validate@6.0.3) - y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) + y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) yjs: 13.6.12 transitivePeerDependencies: - '@aws-sdk/credential-providers' @@ -19684,7 +19476,7 @@ packages: dev: false file:projects/contact-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-6yraj728lS4TvWYPRPGyiMgNs05MaB2VhcXNpifW7apCM8Yj/fC1SWBeG3nVuEXzh2O1QgU5L+IHfIthlRr0zQ==, tarball: file:projects/contact-resources.tgz} + resolution: {integrity: sha512-iVkm89qU3Sx3zlhJRYkBsMy03G536YvuMT1tc6WTLMzklcpqYyCOtklXRWUGGiF/+a56Dog4hu7ai10QUIajrA==, tarball: file:projects/contact-resources.tgz} id: file:projects/contact-resources.tgz name: '@rush-temp/contact-resources' version: 0.0.0 @@ -19793,7 +19585,7 @@ packages: dev: false file:projects/controlled-documents-resources.tgz(@tiptap/pm@2.2.4)(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-iF3smziGBOKC97zmkOx7hVbjMA5RW8qpS+/fDQe6JTDCg+RL25BdNZvMZfTsNHavhXFl9dCY8rEX6JMjRQbzKA==, tarball: file:projects/controlled-documents-resources.tgz} + resolution: {integrity: sha512-0FCU3SCGUuP+6gCexcmP//a/oGxnmLvHft3MwwxXdey/RDAMASAQL8/B/ZMta/OsAWCdB4VmiTqT3ptKxK6KLQ==, tarball: file:projects/controlled-documents-resources.tgz} id: file:projects/controlled-documents-resources.tgz name: '@rush-temp/controlled-documents-resources' version: 0.0.0 @@ -19911,7 +19703,7 @@ packages: dev: false file:projects/devmodel-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-kHR1Pka/0K/BG+5Rir0pzf70uBLVe1sXLMqq0pQDvbneqKZ+sVnoOpi/irhIBZj0dyKp1fRUgG4VSUak/XKImw==, tarball: file:projects/devmodel-resources.tgz} + resolution: {integrity: sha512-EM4KBZ9lTqifDM/zjXmvtXAQV9nokDucxG2kaw6sGe0eW8w2k4NDcVggvHMHUbydTPBmWuvZNpPvZ8RxgrBPog==, tarball: file:projects/devmodel-resources.tgz} id: file:projects/devmodel-resources.tgz name: '@rush-temp/devmodel-resources' version: 0.0.0 @@ -20018,7 +19810,7 @@ packages: dev: false file:projects/document-resources.tgz(@tiptap/pm@2.2.4)(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-jkrHkIZ5LU1amGZFD0uHCrMlaUdMYsBaijF1AD5txElnqayaHc4QOQbKiIAp+7QQBClZ1NE39mk8f67spmzThw==, tarball: file:projects/document-resources.tgz} + resolution: {integrity: sha512-paT/sxyRFUxsWTwzgk98+gGZZkT1a5EyFzSKE4UPyW9sqjM4IiyyIIrr57YZEpILDApfg51PF3qhjEtWV9kf1Q==, tarball: file:projects/document-resources.tgz} id: file:projects/document-resources.tgz name: '@rush-temp/document-resources' version: 0.0.0 @@ -20323,7 +20115,7 @@ packages: dev: false file:projects/gmail-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-+9FMcAbOF9cnRUvgbXWK44xD8emDNBFdB3C7cl/z3xSgIphk2lohhqPuieyZUSQr6IE/1J3JrWnoZx0Zle4Scw==, tarball: file:projects/gmail-resources.tgz} + resolution: {integrity: sha512-mUsHt+qvJU3g60Q8vkgqMmkF5BnXdhJy2brY8yQUUxbmuifX2fJMwtjyeGaxik5Oh1z+8m5vdxOYbv2iwMppLQ==, tarball: file:projects/gmail-resources.tgz} id: file:projects/gmail-resources.tgz name: '@rush-temp/gmail-resources' version: 0.0.0 @@ -20538,7 +20330,7 @@ packages: dev: false file:projects/hr-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-5bCw2OWiDA+HWVXhTL+0SGKq2lwUmC8drV7hamxIA3/ggEiHh2BgdoWrSVsQz/+OnKjl9TP1MKNTZKXvTenHng==, tarball: file:projects/hr-resources.tgz} + resolution: {integrity: sha512-85fy55EMpfKKMiNAp0tW70KLnbppfEp9cDx93jYlteFoPpsi05GRZ2ZNYM9rLWaZ1wMYF1vsX42M0opDIX6KOQ==, tarball: file:projects/hr-resources.tgz} id: file:projects/hr-resources.tgz name: '@rush-temp/hr-resources' version: 0.0.0 @@ -20876,7 +20668,7 @@ packages: dev: false file:projects/lead-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-5KQ8KAzKIPydASWYXm4Sx2nj6dU9jrsLqHUreIeA3MwUK4jMwHz9L0F5XH8BeaplWNyikekdsbkPErOeFDZ0yQ==, tarball: file:projects/lead-resources.tgz} + resolution: {integrity: sha512-YFe9zCBoR5pPRxsoG3Oc9qVVHEWGDlmQrw27HY+3P0SMBXz8xWVjgM6SrL2458y83t/Xsj30krK1zEZkWORfpQ==, tarball: file:projects/lead-resources.tgz} id: file:projects/lead-resources.tgz name: '@rush-temp/lead-resources' version: 0.0.0 @@ -23316,7 +23108,7 @@ packages: dev: false file:projects/prod.tgz(bufferutil@4.0.8)(sass@1.71.1)(ts-node@10.9.2)(utf-8-validate@6.0.3): - resolution: {integrity: sha512-P4zIBP2ImfjS1+c24kgPlng/UxjjTJEbIcbu8zj/XYuh9V/KyLrIdyg7BR9XbPfAu19SeUjqLvIPq5od/Xgk+A==, tarball: file:projects/prod.tgz} + resolution: {integrity: sha512-000EecAzA83jE6Vv147F5OuGLkV2y1lOJWP5xfp02lXPhK53xXfVLAbsqsC28VkyCmnILxAJE3aNkaYQKO/bdg==, tarball: file:projects/prod.tgz} id: file:projects/prod.tgz name: '@rush-temp/prod' version: 0.0.0 @@ -23405,7 +23197,7 @@ packages: dev: false file:projects/products-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-Z7L9cdDU3X7NrVy8Od7iRzv2LfdIl6dTEJn8YtlOPFv6hCFQ5yvRL+NEa4OqSzBB3v2/XvM5aeL6qMGcbzI+zw==, tarball: file:projects/products-resources.tgz} + resolution: {integrity: sha512-UuEDKlz7NZWUtEl7slNROl8XJxb99DPAKtD6tqLTkX30aDpgbzFc+i4zZh0saaUXp/JuDo0tGkEW4eml+MRpyA==, tarball: file:projects/products-resources.tgz} id: file:projects/products-resources.tgz name: '@rush-temp/products-resources' version: 0.0.0 @@ -23546,7 +23338,7 @@ packages: dev: false file:projects/questions-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-VkWGlHc649fAGmD3cFaFs6kEuXAcRjUN8+GhlO24e/OISTbca0STflnU2WQqJ7Gv7e8tSkv5Mxd4ysl2KuLIrg==, tarball: file:projects/questions-resources.tgz} + resolution: {integrity: sha512-AVMNKVmGFrlkGGnVrd2NoILdcqY+qYEzNr0iKIZPY8fPeG1EELleXFksefAG5dSOzV93WZJD5VNI8vxzhJhxZw==, tarball: file:projects/questions-resources.tgz} id: file:projects/questions-resources.tgz name: '@rush-temp/questions-resources' version: 0.0.0 @@ -23686,7 +23478,7 @@ packages: dev: false file:projects/recruit-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-kLjTsiZs/Rx9Q740enWlart5bJEEi+43bXWtPayK56PRRu9ldUmm0Y/4cVwWp4RNs0ncDj4C5xYJvQS8p7Pivg==, tarball: file:projects/recruit-resources.tgz} + resolution: {integrity: sha512-lV5SeYoVFtrnZ+aCJaLiae6k9QH5F6VqCNLeJL+kyj24cjWI3hOL+WVHhZKkmN3MPrSUz4h34pRwTr9Gz1uk9w==, tarball: file:projects/recruit-resources.tgz} id: file:projects/recruit-resources.tgz name: '@rush-temp/recruit-resources' version: 0.0.0 @@ -23824,7 +23616,7 @@ packages: dev: false file:projects/request-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-UG+7YNgpFF+UWSCum6v4S+1OJomrPTfMyvp2O5VDxDcYKBiLfpwVKT1egr6TH/Yxd+SE4QwSvKHyEb4iYOyE7Q==, tarball: file:projects/request-resources.tgz} + resolution: {integrity: sha512-Y5O5y7ixGCEn+Bot2ABstSsghN7G0MFtFKaU6GwBeTk63JrfJfkQda4GmLXq9dE/ekMsiUCck+ohqFjw58QCHg==, tarball: file:projects/request-resources.tgz} id: file:projects/request-resources.tgz name: '@rush-temp/request-resources' version: 0.0.0 @@ -26412,7 +26204,7 @@ packages: dev: false file:projects/task-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-tCmhdn/2mLis9MW2PQTReoXROrgYhSl73b/zKBed6T1LPgcbiNt29gUOvewhQ7BFL5xoWho5AVZ+dPiMF2kc4A==, tarball: file:projects/task-resources.tgz} + resolution: {integrity: sha512-BXlz1rd2Pp3cTgW0USdUS2Ha+hDUYnwAvT9uzlZY1Nn0zOxt6rSC/Qb4e6N1n0gNxpI63ZZl+zyhTkR100yL+g==, tarball: file:projects/task-resources.tgz} id: file:projects/task-resources.tgz name: '@rush-temp/task-resources' version: 0.0.0 @@ -26519,7 +26311,7 @@ packages: dev: false file:projects/telegram-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-jFtk3yrGpxY605M2XEGqcpNDwb2ilC8E8TTnA+izQ/pUmYSpvGvJ0zHTLzszH1QQTbEVkAbSWPZp1p/p+Opz2Q==, tarball: file:projects/telegram-resources.tgz} + resolution: {integrity: sha512-TakwKag4NWDevTKXic9xdAmzPjjw9ezjHVHZYyYcweVBNgloGjjVfGqfBzWyrzcuGCFJRMddfygAHqvSUsuRiQ==, tarball: file:projects/telegram-resources.tgz} id: file:projects/telegram-resources.tgz name: '@rush-temp/telegram-resources' version: 0.0.0 @@ -26626,7 +26418,7 @@ packages: dev: false file:projects/templates-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-dYhAAZsortppkIBPI5VHRVX10lxUq87AZ0E4RuEi4Vsgmlgi5E4l99yrKLsmNNKzaYusqRmWZcMnWpJ3mRA4Mw==, tarball: file:projects/templates-resources.tgz} + resolution: {integrity: sha512-8kSbQj0K35LFGrfL56gmOD1fLpJGL5FZvnfA286XIp7+Y8vuW/+6e8Ds4SVANzWWpGTsmBtCWNSaOoYmAgDIBQ==, tarball: file:projects/templates-resources.tgz} id: file:projects/templates-resources.tgz name: '@rush-temp/templates-resources' version: 0.0.0 @@ -26727,27 +26519,54 @@ packages: - supports-color dev: false - file:projects/text-editor.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(prosemirror-model@1.19.4)(ts-node@10.9.2)(utf-8-validate@6.0.3): - resolution: {integrity: sha512-5pyb9OAuqNH5EmM6Rd84uVwSbvRgHkix21JoILDHzeAxmRmJk9yfYD7gXGq9nO8iMIawt0Uz4v0pLNvgQAUX6Q==, tarball: file:projects/text-editor.tgz} - id: file:projects/text-editor.tgz - name: '@rush-temp/text-editor' + file:projects/text-editor-assets.tgz(esbuild@0.20.1)(ts-node@10.9.2): + resolution: {integrity: sha512-wMIq/Qz9IudMF8tWnHCcSb11OmrfEByJDICav6WZMUK3EZRHp+YMhGYOtDsOaCSeN/CuJxnR8IUU9G+F5zTTBw==, tarball: file:projects/text-editor-assets.tgz} + id: file:projects/text-editor-assets.tgz + name: '@rush-temp/text-editor-assets' version: 0.0.0 dependencies: - '@hocuspocus/provider': 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(yjs@13.6.12) + '@types/jest': 29.5.12 + '@types/node': 20.11.19 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.3.3) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2) + prettier: 3.2.5 + ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.3.3) + typescript: 5.3.3 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - babel-jest + - babel-plugin-macros + - esbuild + - node-notifier + - supports-color + - ts-node + dev: false + + file:projects/text-editor-resources.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(prosemirror-model@1.19.4)(ts-node@10.9.2)(utf-8-validate@6.0.3): + resolution: {integrity: sha512-1Px5KTszIJSV4SoZXJGyJt026vBf4mvVW9Nbf8dfIIP5KhquF3bfaZiLdQ9yMls1P6M1g1Lh44z9wZUaaVvX4Q==, tarball: file:projects/text-editor-resources.tgz} + id: file:projects/text-editor-resources.tgz + name: '@rush-temp/text-editor-resources' + version: 0.0.0 + dependencies: + '@hocuspocus/provider': 2.11.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)(y-protocols@1.0.6)(yjs@13.6.12) '@tiptap/core': 2.2.4(@tiptap/pm@2.2.4) '@tiptap/extension-bubble-menu': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-code': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-code-block': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-collaboration': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4)(y-prosemirror@1.2.2) '@tiptap/extension-collaboration-cursor': 2.2.4(@tiptap/core@2.2.4)(y-prosemirror@1.2.2) - '@tiptap/extension-gapcursor': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-hard-break': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-heading': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-highlight': 2.2.4(@tiptap/core@2.2.4) - '@tiptap/extension-history': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-link': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-list-keymap': 2.2.4(@tiptap/core@2.2.4) - '@tiptap/extension-mention': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4)(@tiptap/suggestion@2.2.4) '@tiptap/extension-placeholder': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-table': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-table-cell': 2.2.4(@tiptap/core@2.2.4) @@ -26759,7 +26578,6 @@ packages: '@tiptap/extension-underline': 2.2.4(@tiptap/core@2.2.4) '@tiptap/pm': 2.2.4 '@tiptap/starter-kit': 2.2.4(@tiptap/pm@2.2.4) - '@tiptap/suggestion': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@types/diff': 5.0.9 '@types/jest': 29.5.12 '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) @@ -26788,8 +26606,8 @@ packages: svelte-preprocess: 5.1.3(postcss-load-config@4.0.2)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.12)(typescript@5.3.3) ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.3.3) typescript: 5.3.3 - y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) - y-websocket: 1.5.4(yjs@13.6.12) + y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) + y-protocols: 1.0.6(yjs@13.6.12) yjs: 13.6.12 transitivePeerDependencies: - '@babel/core' @@ -26814,10 +26632,47 @@ packages: - supports-color - ts-node - utf-8-validate - - y-protocols dev: false - file:projects/text.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(ts-node@10.9.2)(utf-8-validate@6.0.3): + file:projects/text-editor.tgz(@types/node@20.11.19)(esbuild@0.20.1)(svelte@4.2.12)(ts-node@10.9.2): + resolution: {integrity: sha512-PAi3SowjX1BVR2OJFz80YabahPeG+jpRbhNWoOB9mjbVtswR81eVf662kChkZ6xZgLNpwfYt1euhUxBC4esryg==, tarball: file:projects/text-editor.tgz} + id: file:projects/text-editor.tgz + name: '@rush-temp/text-editor' + version: 0.0.0 + dependencies: + '@tiptap/core': 2.2.4(@tiptap/pm@2.2.4) + '@tiptap/pm': 2.2.4 + '@types/diff': 5.0.9 + '@types/jest': 29.5.12 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.3.3) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + filesize: 8.0.7 + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2) + prettier: 3.2.5 + sass: 1.71.1 + svelte-loader: 3.2.0(svelte@4.2.12) + ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.3.3) + typescript: 5.3.3 + yjs: 13.6.12 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - '@types/node' + - babel-jest + - babel-plugin-macros + - esbuild + - node-notifier + - supports-color + - svelte + - ts-node + dev: false + + file:projects/text.tgz(@types/node@20.11.19)(bufferutil@4.0.8)(esbuild@0.20.1)(ts-node@10.9.2)(utf-8-validate@6.0.3)(y-protocols@1.0.6): resolution: {integrity: sha512-mUWWTKZWMvUURAcxKRJaO/G5XdwdP7eAOACU3VU2qA2/RTtHGCREgKMpFFK/LwXXqwx0x+LBwfuozf6jLdyjBg==, tarball: file:projects/text.tgz} id: file:projects/text.tgz name: '@rush-temp/text' @@ -26827,13 +26682,11 @@ packages: '@tiptap/extension-code': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-code-block': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-gapcursor': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) - '@tiptap/extension-hard-break': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-heading': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-highlight': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-history': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-link': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-mention': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4)(@tiptap/suggestion@2.2.4) - '@tiptap/extension-paragraph': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-table': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) '@tiptap/extension-table-cell': 2.2.4(@tiptap/core@2.2.4) '@tiptap/extension-table-header': 2.2.4(@tiptap/core@2.2.4) @@ -26862,7 +26715,7 @@ packages: prosemirror-model: 1.19.4 ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.3.3) typescript: 5.3.3 - y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(yjs@13.6.12) + y-prosemirror: 1.2.2(prosemirror-model@1.19.4)(y-protocols@1.0.6)(yjs@13.6.12) yjs: 13.6.12 transitivePeerDependencies: - '@babel/core' @@ -26959,12 +26812,14 @@ packages: - ts-node dev: false - file:projects/time-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-GYb7+jo7+VvWrnucjHWLU0Mah7dA0BxQnGV5u28f0IKKECUKSkG3IypoEUB1dZ6tlb34sTWHUyelhy91CyQ9Ug==, tarball: file:projects/time-resources.tgz} + file:projects/time-resources.tgz(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4)(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): + resolution: {integrity: sha512-QX5HLp1opauujFHKBxwPKzGRTLIFUyfqHI+ry2gUtuPX7wRGMqqFGdMAMnsQNDiuthwia9mRqUVZIrux6Rrtpg==, tarball: file:projects/time-resources.tgz} id: file:projects/time-resources.tgz name: '@rush-temp/time-resources' version: 0.0.0 dependencies: + '@tiptap/extension-task-item': 2.2.4(@tiptap/core@2.2.4)(@tiptap/pm@2.2.4) + '@tiptap/extension-task-list': 2.2.4(@tiptap/core@2.2.4) '@types/jest': 29.5.12 '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.3.3) @@ -26989,6 +26844,8 @@ packages: transitivePeerDependencies: - '@babel/core' - '@jest/types' + - '@tiptap/core' + - '@tiptap/pm' - '@types/node' - babel-jest - babel-plugin-macros @@ -27124,7 +26981,7 @@ packages: dev: false file:projects/tracker-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-lsB2xQqkbDpBuqGF6FmOdJ+KirjWJfIltndbRzgnXKYkW732y5wknYSMvi+GYt3rW7sCRCyS62Tx4upFJQohBA==, tarball: file:projects/tracker-resources.tgz} + resolution: {integrity: sha512-+EMPmOEZVK78zmDekNE3qkdqMx50z5ijo3A7JdbliP3Tp6zWpsrGurZ/tvjjGCY5DZIxewnfkO2USoNjNPySpQ==, tarball: file:projects/tracker-resources.tgz} id: file:projects/tracker-resources.tgz name: '@rush-temp/tracker-resources' version: 0.0.0 @@ -27232,7 +27089,7 @@ packages: dev: false file:projects/training-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-71HfhNHu0MEXy8+0AL9MkKRuki40EC+UvsIIm/LFc+0VOKFOQqOczKiMAoNyI+MrPv73vGYEIY9LmH9Mw8D9mA==, tarball: file:projects/training-resources.tgz} + resolution: {integrity: sha512-9BXMjzA3PneUA8gWA/cfwaldmcF6Mmxwcv4X2RQkbgVmKm2ibh6GBk2iwJCZjS78FfQw/KX1hTrswzaflyvnsg==, tarball: file:projects/training-resources.tgz} id: file:projects/training-resources.tgz name: '@rush-temp/training-resources' version: 0.0.0 @@ -27429,7 +27286,7 @@ packages: dev: false file:projects/view-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): - resolution: {integrity: sha512-ZMWaeOEIFI2rQy1y3uHS2Vj6rtaBqfInfg2+m3bBS0g8ieRe4u8cJXxK0f1S+i7mNXwrQXAKgiYn/H3d0wc3wg==, tarball: file:projects/view-resources.tgz} + resolution: {integrity: sha512-l/K7osn3HZ3KIFeCyBe+rxQGUxvLvM+35if2HgylqgbWtD10Gk/rR+vuW1L54o8hT4ADMkbhvBW7VHE19isd+w==, tarball: file:projects/view-resources.tgz} id: file:projects/view-resources.tgz name: '@rush-temp/view-resources' version: 0.0.0 diff --git a/dev/prod/package.json b/dev/prod/package.json index 1a0b5dcd43..84ee6093a4 100644 --- a/dev/prod/package.json +++ b/dev/prod/package.json @@ -156,6 +156,8 @@ "@hcengineering/tracker-assets": "^0.6.0", "@hcengineering/tracker-resources": "^0.6.0", "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-assets": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/board": "^0.6.19", "@hcengineering/board-assets": "^0.6.19", "@hcengineering/board-resources": "^0.6.0", diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index bc1dee68eb..0cf78b72fc 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -91,6 +91,7 @@ import '@hcengineering/questions-assets' import '@hcengineering/training-assets' import '@hcengineering/products-assets' import '@hcengineering/controlled-documents-assets' +import '@hcengineering/text-editor-assets' import { coreId } from '@hcengineering/core' import presentation, { parsePreviewConfig, presentationId } from '@hcengineering/presentation' @@ -148,7 +149,7 @@ function configureI18n(): void { addStringsLoader(coreId, async (lang: string) => await import(`@hcengineering/core/lang/${lang}.json`)) addStringsLoader(platformId, async (lang: string) => await import(`@hcengineering/platform/lang/${lang}.json`)) addStringsLoader(presentationId, async (lang: string) => await import(`@hcengineering/presentation/lang/${lang}.json`)) - addStringsLoader(textEditorId, async (lang: string) => await import(`@hcengineering/text-editor/lang/${lang}.json`)) + addStringsLoader(textEditorId, async (lang: string) => await import(`@hcengineering/text-editor-assets/lang/${lang}.json`)) addStringsLoader(uiId, async (lang: string) => await import(`@hcengineering/ui/lang/${lang}.json`)) addStringsLoader(activityId, async (lang: string) => await import(`@hcengineering/activity-assets/lang/${lang}.json`)) addStringsLoader(attachmentId, async (lang: string) => await import(`@hcengineering/attachment-assets/lang/${lang}.json`)) @@ -281,7 +282,6 @@ export async function configurePlatform() { addLocation(coreId, async () => ({ default: async () => ({}) })) addLocation(presentationId, async () => ({ default: async () => ({}) })) - addLocation(textEditorId, async () => ({ default: async () => ({}) })) addLocation(clientId, () => import(/* webpackChunkName: "client" */ '@hcengineering/client-resources')) addLocation(loginId, () => import(/* webpackChunkName: "login" */ '@hcengineering/login-resources')) @@ -320,6 +320,7 @@ export async function configurePlatform() { addLocation(documentsId, () => import(/* webpackChunkName: "documents" */ '@hcengineering/controlled-documents-resources')) addLocation(loveId, () => import(/* webpackChunkName: "love" */ '@hcengineering/love-resources')) addLocation(printId, () => import(/* webpackChunkName: "print" */ '@hcengineering/print-resources')) + addLocation(textEditorId, () => import(/* webpackChunkName: "text-editor" */ '@hcengineering/text-editor-resources')) setMetadata(client.metadata.FilterModel, true) setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin]) diff --git a/models/document/src/index.ts b/models/document/src/index.ts index 4c577d450d..4a7ba8d0bc 100644 --- a/models/document/src/index.ts +++ b/models/document/src/index.ts @@ -52,7 +52,7 @@ import workbench from '@hcengineering/model-workbench' import notification from '@hcengineering/notification' import { getEmbeddedLabel, type Asset } from '@hcengineering/platform' import tags from '@hcengineering/tags' -import time from '@hcengineering/time' +import time, { type ToDo, type Todoable } from '@hcengineering/time' import document from './plugin' export { documentId } from '@hcengineering/document' @@ -71,7 +71,7 @@ export class TDocumentEmbedding extends TAttachment implements DocumentEmbedding @Model(document.class.Document, core.class.AttachedDoc, DOMAIN_DOCUMENT) @UX(document.string.Document, document.icon.Document, undefined, 'name', undefined, document.string.Documents) -export class TDocument extends TAttachedDoc implements Document { +export class TDocument extends TAttachedDoc implements Document, Todoable { @Prop(TypeRef(document.class.Document), document.string.ParentDocument) declare attachedTo: Ref @@ -127,6 +127,9 @@ export class TDocument extends TAttachedDoc implements Document { @Hidden() @Index(IndexKind.FullText) color?: number + + @Prop(Collection(time.class.ToDo), getEmbeddedLabel('Action Items')) + todos?: CollectionSize } @Model(document.class.DocumentSnapshot, core.class.AttachedDoc, DOMAIN_DOCUMENT) diff --git a/models/text-editor/src/index.ts b/models/text-editor/src/index.ts index 950151a6ed..ae34cf4dfa 100644 --- a/models/text-editor/src/index.ts +++ b/models/text-editor/src/index.ts @@ -17,13 +17,17 @@ import { DOMAIN_MODEL } from '@hcengineering/core' import { type Builder, Model } from '@hcengineering/model' import core, { TDoc } from '@hcengineering/model-core' import type { Asset, IntlString, Resource } from '@hcengineering/platform' -// Import types to prevent .svelte components to being exposed to type typescript. -import { type RefInputAction, type RefInputActionItem } from '@hcengineering/text-editor/src/types' +import { + type ExtensionCreator, + type TextEditorExtensionFactory, + type RefInputAction, + type RefInputActionItem +} from '@hcengineering/text-editor' import textEditor from './plugin' export { textEditorOperation } from './migration' -export { textEditorId } from '@hcengineering/text-editor/src/plugin' export { default } from './plugin' +export { textEditorId } from '@hcengineering/text-editor' export type { RefInputAction, RefInputActionItem } @Model(textEditor.class.RefInputActionItem, core.class.Doc, DOMAIN_MODEL) @@ -35,6 +39,12 @@ export class TRefInputActionItem extends TDoc implements RefInputActionItem { action!: Resource } -export function createModel (builder: Builder): void { - builder.createModel(TRefInputActionItem) +@Model(textEditor.class.TextEditorExtensionFactory, core.class.Doc, DOMAIN_MODEL) +export class TTextEditorExtensionFactory extends TDoc implements TextEditorExtensionFactory { + index!: number + create!: Resource +} + +export function createModel (builder: Builder): void { + builder.createModel(TRefInputActionItem, TTextEditorExtensionFactory) } diff --git a/models/text-editor/src/plugin.ts b/models/text-editor/src/plugin.ts index fc2cc6ca38..8bf731bf57 100644 --- a/models/text-editor/src/plugin.ts +++ b/models/text-editor/src/plugin.ts @@ -1,6 +1,6 @@ // // Copyright © 2020, 2021 Anticrm Platform Contributors. -// Copyright © 2021 Hardcore Engineering Inc. +// Copyright © 2022, 2023, 2024 Hardcore Engineering Inc. // // Licensed under the Eclipse Public License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. You may @@ -16,6 +16,6 @@ import { mergeIds } from '@hcengineering/platform' // Import plugin directly to prevent .svelte components to being exposed to type typescript. -import textEditor, { textEditorId } from '@hcengineering/text-editor/src/plugin' +import textEditor, { textEditorId } from '@hcengineering/text-editor' export default mergeIds(textEditorId, textEditor, {}) diff --git a/models/time/package.json b/models/time/package.json index 3a787b6b36..343149f901 100644 --- a/models/time/package.json +++ b/models/time/package.json @@ -49,6 +49,7 @@ "@hcengineering/activity": "^0.6.0", "@hcengineering/notification": "^0.6.23", "@hcengineering/model-tracker": "^0.6.0", + "@hcengineering/text-editor": "^0.6.0", "@hcengineering/time": "^0.6.0", "@hcengineering/time-resources": "^0.6.0", "@hcengineering/rank": "^0.6.4" diff --git a/models/time/src/index.ts b/models/time/src/index.ts index 39b6b4258b..6bdc10f79b 100644 --- a/models/time/src/index.ts +++ b/models/time/src/index.ts @@ -43,6 +43,7 @@ import { Hidden, Index } from '@hcengineering/model' +import textEditor from '@hcengineering/text-editor' import { TEvent } from '@hcengineering/model-calendar' import core, { TAttachedDoc, TClass, TDoc, TType } from '@hcengineering/model-core' import tracker from '@hcengineering/model-tracker' @@ -398,6 +399,16 @@ export function createModel (builder: Builder): void { { modifiedOn: 1 } ] }) + + builder.createDoc(textEditor.class.TextEditorExtensionFactory, core.space.Model, { + index: 510, + create: time.function.CreateTodoItemExtension + }) + + builder.createDoc(textEditor.class.TextEditorExtensionFactory, core.space.Model, { + index: 520, + create: time.function.CreateTodoListExtension + }) } export * from './migration' diff --git a/models/time/src/plugin.ts b/models/time/src/plugin.ts index 76c8e0c0e2..28c07b59e2 100644 --- a/models/time/src/plugin.ts +++ b/models/time/src/plugin.ts @@ -21,6 +21,7 @@ import { type Action, type ActionCategory } from '@hcengineering/view' import { timeId } from '@hcengineering/time' import time from '@hcengineering/time-resources/src/plugin' import { type NotificationGroup, type NotificationType } from '@hcengineering/notification' +import { type ExtensionCreator } from '@hcengineering/text-editor' export default mergeIds(timeId, time, { action: { @@ -61,6 +62,8 @@ export default mergeIds(timeId, time, { ToDoCreated: '' as Ref }, function: { - ToDoTitleProvider: '' as Resource<(client: Client, ref: Ref, doc?: Doc) => Promise> + ToDoTitleProvider: '' as Resource<(client: Client, ref: Ref, doc?: Doc) => Promise>, + CreateTodoItemExtension: '' as Resource, + CreateTodoListExtension: '' as Resource } }) diff --git a/models/tracker/package.json b/models/tracker/package.json index c045cfa6e6..042cb48904 100644 --- a/models/tracker/package.json +++ b/models/tracker/package.json @@ -46,6 +46,7 @@ "@hcengineering/platform": "^0.6.11", "@hcengineering/setting": "^0.6.17", "@hcengineering/tags": "^0.6.16", + "@hcengineering/time": "^0.6.0", "@hcengineering/task": "^0.6.20", "@hcengineering/tracker": "^0.6.24", "@hcengineering/tracker-resources": "^0.6.0", diff --git a/models/tracker/src/types.ts b/models/tracker/src/types.ts index 6a9f57387c..4cbeb7dbdd 100644 --- a/models/tracker/src/types.ts +++ b/models/tracker/src/types.ts @@ -27,6 +27,7 @@ import { type Type, type RolesAssignment, type Role, + type CollectionSize, Account } from '@hcengineering/core' import { @@ -52,6 +53,7 @@ import core, { TAttachedDoc, TDoc, TStatus, TType } from '@hcengineering/model-c import task, { TTask, TProject as TTaskProject } from '@hcengineering/model-task' import { getEmbeddedLabel, type IntlString } from '@hcengineering/platform' import tags, { type TagElement } from '@hcengineering/tags' +import time, { type ToDo } from '@hcengineering/time' import { type ProjectTargetPreference, type Component, @@ -251,6 +253,9 @@ export class TIssue extends TTask implements Issue { reports!: number declare childInfo: IssueChildInfo[] + + @Prop(Collection(time.class.ToDo), getEmbeddedLabel('Action Items')) + todos?: CollectionSize } /** * @public diff --git a/packages/presentation/src/components/markup/NodeContent.svelte b/packages/presentation/src/components/markup/NodeContent.svelte index e43284dcb4..2986e53582 100644 --- a/packages/presentation/src/components/markup/NodeContent.svelte +++ b/packages/presentation/src/components/markup/NodeContent.svelte @@ -14,7 +14,7 @@ --> diff --git a/packages/text-editor/CHANGELOG.json b/packages/text-editor/CHANGELOG.json deleted file mode 100644 index 6749a968af..0000000000 --- a/packages/text-editor/CHANGELOG.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "@hcengineering/text-editor", - "entries": [ - { - "version": "0.6.0", - "tag": "@hcengineering/text-editor_v0.6.0", - "date": "Sun, 08 Aug 2021 21:05:26 GMT", - "comments": { - "dependency": [ - { - "comment": "Updating dependency \"@hcengineering/presentation\" from `~0.6.0` to `~0.6.1`" - }, - { - "comment": "Updating dependency \"@hcengineering/core\" from `~0.6.0` to `~0.6.8`" - } - ] - } - } - ] -} diff --git a/packages/text-editor/CHANGELOG.md b/packages/text-editor/CHANGELOG.md deleted file mode 100644 index 97a0db38b2..0000000000 --- a/packages/text-editor/CHANGELOG.md +++ /dev/null @@ -1,9 +0,0 @@ -# Change Log - @hcengineering/text-editor - -This log was last generated on Sun, 08 Aug 2021 21:05:26 GMT and should not be manually modified. - -## 0.6.0 -Sun, 08 Aug 2021 21:05:26 GMT - -_Initial release_ - diff --git a/packages/text-editor/src/changeSet.ts b/packages/text-editor/src/changeSet.ts deleted file mode 100644 index 2a58e749e6..0000000000 --- a/packages/text-editor/src/changeSet.ts +++ /dev/null @@ -1,168 +0,0 @@ -import { Extension, Mark, mergeAttributes } from '@tiptap/core' -import { ChangeSet } from '@tiptap/pm/changeset' -import { Plugin } from '@tiptap/pm/state' - -export interface ChangeHighlightOptions { - multicolor: boolean - HTMLAttributes: Record -} - -declare module '@tiptap/core' { - interface Commands { - changeHighlight: { - /** - * Set a highlight mark - */ - setChangeHighlight: (attributes?: { color: string }) => ReturnType - /** - * Toggle a highlight mark - */ - toggleChangeHighlight: (attributes?: { color: string }) => ReturnType - /** - * Unset a highlight mark - */ - unsetChangeHighlight: () => ReturnType - } - } -} - -export const ChangeHighlight = Mark.create({ - name: 'changeHighlight', - - addOptions () { - return { - multicolor: true, - HTMLAttributes: { - changeColor: 'yellow' - } - } - }, - - addAttributes () { - if (!this.options.multicolor) { - return {} - } - - return { - color: { - default: null, - parseHTML: (element) => element.getAttribute('color'), - renderHTML: (attributes) => { - // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions - if (!attributes.color) { - return {} - } - - const color = attributes.color as string - - return { - color, - style: `border-top: 1px solid ${color}; border-bottom: 1px solid ${color}; border-radius: 2px;` - } - } - } - } - }, - - parseHTML () { - return [ - { - tag: 'cmark' - } - ] - }, - - renderHTML ({ HTMLAttributes }) { - return ['cmark', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0] - }, - - addCommands () { - return { - setChangeHighlight: - (attributes) => - ({ commands }) => { - return commands.setMark(this.name, attributes) - }, - toggleChangeHighlight: - (attributes) => - ({ commands }) => { - return commands.toggleMark(this.name, attributes) - }, - unsetChangeHighlight: - () => - ({ commands }) => { - return commands.unsetMark(this.name) - } - } - } -}) - -export interface ChangesetExtensionOptions { - isSuggestMode: () => boolean -} - -export const ChangesetExtension = Extension.create({ - // addInputRules () { - // return [changeSetRule] - // }, - addProseMirrorPlugins () { - return [ - new Plugin({ - appendTransaction: (_transactions, oldState, newState) => { - // no changes - if (newState.doc === oldState.doc) { - return - } - const tr = newState.tr - if (this.options.isSuggestMode()) { - let changes = ChangeSet.create(oldState.doc) - - for (const tr of _transactions) { - changes = changes.addSteps(tr.doc, tr.mapping.maps, undefined) - } - - for (const r of changes.changes) { - const from = r.fromB - const to = r.toB - if (r.inserted.length > 0 && from !== to) { - tr.addMark(from, to, newState.schema.marks.changeHighlight.create({ color: 'lightblue' })) - } - - if (r.deleted.length > 0) { - const deletedText = oldState.doc.textBetween(r.fromA, r.toA) - tr.insertText(deletedText, from) - tr.addMark( - from, - from + deletedText.length, - newState.schema.marks.changeHighlight.create({ color: 'orange' }) - ) - } - } - } - return tr - } - }) - ] - }, - onCreate () { - // The editor is ready. - }, - onUpdate () { - // The content has changed. - }, - // onSelectionUpdate ({ editor }) { - // // The selection has changed. - // }, - onTransaction ({ transaction }) { - // The editor state has changed. - }, - onFocus ({ event }) { - // The editor is focused. - }, - onBlur ({ event }) { - // The editor isn’t focused anymore. - }, - onDestroy () { - // The editor is being destroyed. - } -}) diff --git a/packages/text-editor/src/kits/editor-kit.ts b/packages/text-editor/src/kits/editor-kit.ts deleted file mode 100644 index c870752a35..0000000000 --- a/packages/text-editor/src/kits/editor-kit.ts +++ /dev/null @@ -1,135 +0,0 @@ -// -// Copyright © 2023 Hardcore Engineering Inc. -// -// Licensed under the Eclipse Public License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. You may -// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import { Extension } from '@tiptap/core' -import { type Level } from '@tiptap/extension-heading' -import ListKeymap from '@tiptap/extension-list-keymap' -import TableHeader from '@tiptap/extension-table-header' -import TaskItem from '@tiptap/extension-task-item' -import TaskList from '@tiptap/extension-task-list' - -import { DefaultKit, type DefaultKitOptions } from './default-kit' -import 'prosemirror-codemark/dist/codemark.css' -import { getBlobRef } from '@hcengineering/presentation' -import { CodeBlockExtension, codeBlockOptions, CodeExtension, codeOptions } from '@hcengineering/text' -import { HardBreakExtension } from '../components/extension/hardBreak' -import { FileExtension, type FileOptions } from '../components/extension/fileExt' -import { ImageExtension, type ImageOptions } from '../components/extension/imageExt' -import { NodeUuidExtension } from '../components/extension/nodeUuid' -import { Table, TableCell, TableRow } from '../components/extension/table' -import { SubmitExtension, type SubmitOptions } from '../components/extension/submit' -import { ParagraphExtension } from '../components/extension/paragraph' - -const headingLevels: Level[] = [1, 2, 3] - -export const tableExtensions = [ - Table.configure({ - resizable: false, - HTMLAttributes: { - class: 'proseTable' - } - }), - TableRow.configure({}), - TableHeader.configure({}), - TableCell.configure({}) -] - -export const taskListExtensions = [ - TaskList, - TaskItem.configure({ - nested: true, - HTMLAttributes: { - class: 'flex flex-grow gap-1 checkbox_style' - } - }) -] - -export interface EditorKitOptions extends DefaultKitOptions { - history?: false - file?: Partial | false - image?: Partial | false - mode?: 'full' | 'compact' - submit?: SubmitOptions | false -} - -export const EditorKit = Extension.create({ - name: 'defaultKit', - - addExtensions () { - const mode = this.options.mode ?? 'full' - return [ - // table extensions should go before list items - ...tableExtensions, - DefaultKit.configure({ - ...this.options, - code: false, - codeBlock: false, - hardBreak: false, - heading: { - levels: headingLevels - } - }), - CodeBlockExtension.configure(codeBlockOptions), - CodeExtension.configure(codeOptions), - HardBreakExtension.configure({ shortcuts: mode }), - ...(this.options.submit !== false - ? [ - SubmitExtension.configure({ - useModKey: mode === 'full', - ...this.options.submit - }) - ] - : []), - ...(mode === 'compact' ? [ParagraphExtension.configure()] : []), - ListKeymap.configure({ - listTypes: [ - { - itemName: 'listItem', - wrapperNames: ['bulletList', 'orderedList'] - }, - { - itemName: 'taskItem', - wrapperNames: ['taskList'] - }, - { - itemName: 'todoItem', - wrapperNames: ['todoList'] - } - ] - }), - NodeUuidExtension, - ...(this.options.file !== false - ? [ - FileExtension.configure({ - inline: true, - ...this.options.file - }) - ] - : []), - ...(this.options.image !== false - ? [ - ImageExtension.configure({ - inline: true, - loadingImgSrc: - 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgd2lkdGg9IjMycHgiIGhlaWdodD0iMzJweCIgdmlld0JveD0iMCAwIDE2IDE2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg0KICAgIDxwYXRoIGQ9Im0gNCAxIGMgLTEuNjQ0NTMxIDAgLTMgMS4zNTU0NjkgLTMgMyB2IDEgaCAxIHYgLTEgYyAwIC0xLjEwOTM3NSAwLjg5MDYyNSAtMiAyIC0yIGggMSB2IC0xIHogbSAyIDAgdiAxIGggNCB2IC0xIHogbSA1IDAgdiAxIGggMSBjIDEuMTA5Mzc1IDAgMiAwLjg5MDYyNSAyIDIgdiAxIGggMSB2IC0xIGMgMCAtMS42NDQ1MzEgLTEuMzU1NDY5IC0zIC0zIC0zIHogbSAtNSA0IGMgLTAuNTUwNzgxIDAgLTEgMC40NDkyMTkgLTEgMSBzIDAuNDQ5MjE5IDEgMSAxIHMgMSAtMC40NDkyMTkgMSAtMSBzIC0wLjQ0OTIxOSAtMSAtMSAtMSB6IG0gLTUgMSB2IDQgaCAxIHYgLTQgeiBtIDEzIDAgdiA0IGggMSB2IC00IHogbSAtNC41IDIgbCAtMiAyIGwgLTEuNSAtMSBsIC0yIDIgdiAwLjUgYyAwIDAuNSAwLjUgMC41IDAuNSAwLjUgaCA3IHMgMC40NzI2NTYgLTAuMDM1MTU2IDAuNSAtMC41IHYgLTEgeiBtIC04LjUgMyB2IDEgYyAwIDEuNjQ0NTMxIDEuMzU1NDY5IDMgMyAzIGggMSB2IC0xIGggLTEgYyAtMS4xMDkzNzUgMCAtMiAtMC44OTA2MjUgLTIgLTIgdiAtMSB6IG0gMTMgMCB2IDEgYyAwIDEuMTA5Mzc1IC0wLjg5MDYyNSAyIC0yIDIgaCAtMSB2IDEgaCAxIGMgMS42NDQ1MzEgMCAzIC0xLjM1NTQ2OSAzIC0zIHYgLTEgeiBtIC04IDMgdiAxIGggNCB2IC0xIHogbSAwIDAiIGZpbGw9IiMyZTM0MzQiIGZpbGwtb3BhY2l0eT0iMC4zNDkwMiIvPg0KPC9zdmc+DQo=', - getBlobRef: async (file, name, size) => await getBlobRef(undefined, file, name, size), - ...this.options.image - }) - ] - : []) - // ...taskListExtensions // Disable since tasks are not working properly now. - ] - } -}) diff --git a/packages/text/src/markup/model.ts b/packages/text/src/markup/model.ts index ceff9a84ac..344105b5b9 100644 --- a/packages/text/src/markup/model.ts +++ b/packages/text/src/markup/model.ts @@ -30,6 +30,8 @@ export enum MarkupNodeType { list_item = 'listItem', taskList = 'taskList', taskItem = 'taskItem', + todoList = 'todoList', + todoItem = 'todoItem', subLink = 'subLink', table = 'table', table_row = 'tableRow', @@ -53,12 +55,15 @@ export interface MarkupMark { attrs: Record // A map of attributes } +export type AttrValue = string | number | boolean +export type Attrs = Record + /** @public */ export interface MarkupNode { type: MarkupNodeType content?: MarkupNode[] // A list of child nodes marks?: MarkupMark[] - attrs?: Record + attrs?: Attrs text?: string } diff --git a/plugins/attachment-resources/package.json b/plugins/attachment-resources/package.json index 9336eaf063..47200b1a80 100644 --- a/plugins/attachment-resources/package.json +++ b/plugins/attachment-resources/package.json @@ -47,7 +47,9 @@ "@hcengineering/platform": "^0.6.11", "@hcengineering/preference": "^0.6.13", "@hcengineering/presentation": "^0.6.3", + "@hcengineering/text": "^0.6.5", "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/ui": "^0.6.15", "@hcengineering/view": "^0.6.13", "@hcengineering/view-resources": "^0.6.0", diff --git a/plugins/attachment-resources/src/components/AccordionEditor.svelte b/plugins/attachment-resources/src/components/AccordionEditor.svelte index 0eef253b3a..753ea63129 100644 --- a/plugins/attachment-resources/src/components/AccordionEditor.svelte +++ b/plugins/attachment-resources/src/components/AccordionEditor.svelte @@ -16,7 +16,9 @@ import { createEventDispatcher } from 'svelte' import { Doc, Ref, Space, Class } from '@hcengineering/core' import { Button, Label, IconDownOutline, tooltip } from '@hcengineering/ui' - import textEditorPlugin, { IsEmptyContentExtension, TextEditor } from '@hcengineering/text-editor' + import textEditorPlugin from '@hcengineering/text-editor' + import { IsEmptyContentExtension, TextEditor } from '@hcengineering/text-editor-resources' + import type { AccordionItem } from '..' import AttachmentStyledBox from './AttachmentStyledBox.svelte' diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte index 7520420db6..9645de8a98 100644 --- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte +++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte @@ -25,7 +25,9 @@ getFileMetadata, uploadFile } from '@hcengineering/presentation' - import textEditor, { AttachIcon, EmptyMarkup, ReferenceInput, type RefAction } from '@hcengineering/text-editor' + import textEditor, { type RefAction } from '@hcengineering/text-editor' + import { AttachIcon, ReferenceInput } from '@hcengineering/text-editor-resources' + import { EmptyMarkup } from '@hcengineering/text' import { Loading, type AnySvelteComponent } from '@hcengineering/ui' import { createEventDispatcher, onDestroy, tick } from 'svelte' import attachment from '../plugin' diff --git a/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte b/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte index 8ed4ccea43..58eccf421a 100644 --- a/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte +++ b/plugins/attachment-resources/src/components/AttachmentStyleBoxCollabEditor.svelte @@ -19,17 +19,17 @@ import { IntlString, getResource, setPlatformStatus, unknownError } from '@hcengineering/platform' import { KeyedAttribute, createQuery, getClient, uploadFile } from '@hcengineering/presentation' import { getCollaborationUser, getObjectLinkFragment } from '@hcengineering/view-resources' - import textEditor, { + import textEditor, { type RefAction, type TextEditorHandler } from '@hcengineering/text-editor' + import { AttachIcon, CollaborativeAttributeBox, - RefAction, TableIcon, - TextEditorHandler, - addTableHandler - } from '@hcengineering/text-editor' + addTableHandler, + defaultRefActions, + getModelRefActions + } from '@hcengineering/text-editor-resources' import { AnySvelteComponent, getEventPositionElement, getPopupPositionElement, navigate } from '@hcengineering/ui' import view from '@hcengineering/view' - import { defaultRefActions, getModelRefActions } from '@hcengineering/text-editor/src/components/editor/actions' import AttachmentsGrid from './AttachmentsGrid.svelte' diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte index b928017e00..bb89822b82 100644 --- a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte +++ b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte @@ -26,7 +26,9 @@ getFileMetadata, uploadFile } from '@hcengineering/presentation' - import textEditor, { AttachIcon, EmptyMarkup, type RefAction, StyledTextBox } from '@hcengineering/text-editor' + import textEditor, { type RefAction } from '@hcengineering/text-editor' + import { EmptyMarkup } from '@hcengineering/text' + import { AttachIcon, StyledTextBox } from '@hcengineering/text-editor-resources' import { ButtonSize } from '@hcengineering/ui' import attachment from '../plugin' diff --git a/plugins/bitrix-resources/package.json b/plugins/bitrix-resources/package.json index 913519d24b..1505f137ee 100644 --- a/plugins/bitrix-resources/package.json +++ b/plugins/bitrix-resources/package.json @@ -42,7 +42,6 @@ "@hcengineering/bitrix": "^0.6.52", "@hcengineering/ui": "^0.6.15", "@hcengineering/presentation": "^0.6.3", - "@hcengineering/text-editor": "^0.6.0", "@hcengineering/contact": "^0.6.24", "@hcengineering/lead": "^0.6.0", "@hcengineering/login": "^0.6.12", diff --git a/plugins/board-resources/package.json b/plugins/board-resources/package.json index e4e0583aab..bbed8dfa5f 100644 --- a/plugins/board-resources/package.json +++ b/plugins/board-resources/package.json @@ -53,7 +53,7 @@ "@hcengineering/platform": "^0.6.11", "@hcengineering/presentation": "^0.6.3", "@hcengineering/task": "^0.6.20", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/ui": "^0.6.15", "@hcengineering/view": "^0.6.13", "@hcengineering/view-resources": "^0.6.0", diff --git a/plugins/board-resources/src/components/EditCard.svelte b/plugins/board-resources/src/components/EditCard.svelte index e457df5ea2..0c43905688 100644 --- a/plugins/board-resources/src/components/EditCard.svelte +++ b/plugins/board-resources/src/components/EditCard.svelte @@ -19,7 +19,7 @@ import core, { Class, Doc, Mixin, Ref, Space } from '@hcengineering/core' import { Panel } from '@hcengineering/panel' import { createQuery, getClient } from '@hcengineering/presentation' - import { StyledTextBox } from '@hcengineering/text-editor' + import { StyledTextBox } from '@hcengineering/text-editor-resources' import { Button, EditBox, IconMoreH } from '@hcengineering/ui' import { DocAttributeBar, ParentsNavigator, invokeAction, showMenu } from '@hcengineering/view-resources' import { createEventDispatcher, onMount } from 'svelte' diff --git a/plugins/calendar-resources/package.json b/plugins/calendar-resources/package.json index 78930096fd..33ec9afcc7 100644 --- a/plugins/calendar-resources/package.json +++ b/plugins/calendar-resources/package.json @@ -46,7 +46,8 @@ "@hcengineering/setting": "^0.6.17", "@hcengineering/theme": "^0.6.5", "svelte": "^4.2.12", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text": "^0.6.5", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/contact": "^0.6.24", "@hcengineering/panel": "^0.6.23", "@hcengineering/contact-resources": "^0.6.0", diff --git a/plugins/calendar-resources/src/components/CreateEvent.svelte b/plugins/calendar-resources/src/components/CreateEvent.svelte index 8933b67c58..421cf68333 100644 --- a/plugins/calendar-resources/src/components/CreateEvent.svelte +++ b/plugins/calendar-resources/src/components/CreateEvent.svelte @@ -17,7 +17,8 @@ import { Person, PersonAccount } from '@hcengineering/contact' import { Class, Doc, Markup, Ref, getCurrentAccount } from '@hcengineering/core' import presentation, { createQuery, getClient } from '@hcengineering/presentation' - import { EmptyMarkup, StyledTextBox } from '@hcengineering/text-editor' + import { EmptyMarkup } from '@hcengineering/text' + import { StyledTextBox } from '@hcengineering/text-editor-resources' import { Button, EditBox, diff --git a/plugins/calendar-resources/src/components/EditEvent.svelte b/plugins/calendar-resources/src/components/EditEvent.svelte index d2bee0b77d..82754eebd4 100644 --- a/plugins/calendar-resources/src/components/EditEvent.svelte +++ b/plugins/calendar-resources/src/components/EditEvent.svelte @@ -17,7 +17,7 @@ import { Person } from '@hcengineering/contact' import { DocumentUpdate, Ref } from '@hcengineering/core' import presentation, { getClient } from '@hcengineering/presentation' - import { StyledTextBox } from '@hcengineering/text-editor' + import { StyledTextBox } from '@hcengineering/text-editor-resources' import { Button, EditBox, diff --git a/plugins/chunter-resources/package.json b/plugins/chunter-resources/package.json index 17d26573d3..ecef85207d 100644 --- a/plugins/chunter-resources/package.json +++ b/plugins/chunter-resources/package.json @@ -54,7 +54,7 @@ "@hcengineering/platform": "^0.6.11", "@hcengineering/preference": "^0.6.13", "@hcengineering/presentation": "^0.6.3", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text": "^0.6.5", "@hcengineering/ui": "^0.6.15", "@hcengineering/view": "^0.6.13", "@hcengineering/view-resources": "^0.6.0", diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte index d89ed14896..f4e8e428f1 100644 --- a/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte +++ b/plugins/chunter-resources/src/components/chat-message/ChatMessageInput.svelte @@ -20,7 +20,7 @@ import { PersonAccount } from '@hcengineering/contact' import { Class, Doc, generateId, getCurrentAccount, Ref, type CommitResult } from '@hcengineering/core' import { createQuery, DraftController, draftsStore, getClient, isSpace } from '@hcengineering/presentation' - import { EmptyMarkup } from '@hcengineering/text-editor' + import { EmptyMarkup } from '@hcengineering/text' import { createEventDispatcher } from 'svelte' export let object: Doc diff --git a/plugins/contact-resources/package.json b/plugins/contact-resources/package.json index 5e4f4114b1..a9411660f6 100644 --- a/plugins/contact-resources/package.json +++ b/plugins/contact-resources/package.json @@ -56,6 +56,7 @@ "@hcengineering/templates": "^0.6.11", "@hcengineering/image-cropper": "^0.6.0", "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/theme": "^0.6.5" } } diff --git a/plugins/controlled-documents-resources/package.json b/plugins/controlled-documents-resources/package.json index 7b76b17e4d..940902c21a 100644 --- a/plugins/controlled-documents-resources/package.json +++ b/plugins/controlled-documents-resources/package.json @@ -53,7 +53,9 @@ "@hcengineering/contact": "^0.6.24", "@hcengineering/contact-resources": "^0.6.0", "@hcengineering/tags": "^0.6.16", + "@hcengineering/text": "^0.6.5", "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/activity": "^0.6.0", "@hcengineering/request": "^0.6.14", "@hcengineering/request-resources": "^0.6.0", @@ -67,7 +69,6 @@ "@tiptap/core": "^2.2.4", "effector": "~22.8.7", "svelte": "^4.2.12", - "yjs": "^13.5.52", "slugify": "^1.6.6", "fast-equals": "^5.0.1" } diff --git a/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte b/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte index 9e715a230e..09408feebd 100644 --- a/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte +++ b/plugins/controlled-documents-resources/src/components/EditDocPanel.svelte @@ -18,7 +18,7 @@ import { Panel } from '@hcengineering/panel' import { getResource } from '@hcengineering/platform' import { getClient } from '@hcengineering/presentation' - import { Collaboration } from '@hcengineering/text-editor' + import { Collaboration } from '@hcengineering/text-editor-resources' import { Button, Chevron, diff --git a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte index f5d67381b0..dca09b958a 100644 --- a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte +++ b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte @@ -29,7 +29,7 @@ Class } from '@hcengineering/core' import presentation, { Card, getClient } from '@hcengineering/presentation' - import { StyledTextBox } from '@hcengineering/text-editor' + import { StyledTextBox } from '@hcengineering/text-editor-resources' import { EditBox, Label, Toggle } from '@hcengineering/ui' import { SpaceTypeSelector } from '@hcengineering/view-resources' import documents, { DocumentSpace, DocumentSpaceType } from '@hcengineering/controlled-documents' diff --git a/plugins/controlled-documents-resources/src/components/document/DocSectionEditor.svelte b/plugins/controlled-documents-resources/src/components/document/DocSectionEditor.svelte index 022dc2caf6..52ff4ba154 100644 --- a/plugins/controlled-documents-resources/src/components/document/DocSectionEditor.svelte +++ b/plugins/controlled-documents-resources/src/components/document/DocSectionEditor.svelte @@ -15,7 +15,8 @@ @@ -92,6 +59,7 @@ collaborativeDoc={object.content} objectClass={object._class} objectId={object._id} + objectSpace={object.space} objectAttr="content" field="content" {user} diff --git a/plugins/document-resources/src/components/EditDoc.svelte b/plugins/document-resources/src/components/EditDoc.svelte index db690996ca..fa90ad3950 100644 --- a/plugins/document-resources/src/components/EditDoc.svelte +++ b/plugins/document-resources/src/components/EditDoc.svelte @@ -23,7 +23,8 @@ import { getResource, setPlatformStatus, unknownError } from '@hcengineering/platform' import { copyTextToClipboard, createQuery, getClient } from '@hcengineering/presentation' import tags from '@hcengineering/tags' - import { Heading, TableOfContents } from '@hcengineering/text-editor' + import { Heading } from '@hcengineering/text-editor' + import { TableOfContents } from '@hcengineering/text-editor-resources' import { Button, ButtonItem, diff --git a/plugins/document-resources/src/plugin.ts b/plugins/document-resources/src/plugin.ts index 96c788bb65..52e193a833 100644 --- a/plugins/document-resources/src/plugin.ts +++ b/plugins/document-resources/src/plugin.ts @@ -87,11 +87,6 @@ export default mergeIds(documentId, document, { CompareTo: '' as IntlString, - UnassignToDo: '' as IntlString, - UnassignToDoConfirm: '' as IntlString, - ReassignToDo: '' as IntlString, - ReassignToDoConfirm: '' as IntlString, - Color: '' as IntlString, Icon: '' as IntlString, diff --git a/plugins/gmail-resources/package.json b/plugins/gmail-resources/package.json index 2398438366..89612886e5 100644 --- a/plugins/gmail-resources/package.json +++ b/plugins/gmail-resources/package.json @@ -45,6 +45,7 @@ "@hcengineering/presentation": "^0.6.3", "@hcengineering/text": "^0.6.5", "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/contact": "^0.6.24", "@hcengineering/setting": "^0.6.17", "@hcengineering/chunter": "^0.6.20", diff --git a/plugins/gmail-resources/src/components/NewMessage.svelte b/plugins/gmail-resources/src/components/NewMessage.svelte index a9c3f83296..a9e940a710 100644 --- a/plugins/gmail-resources/src/components/NewMessage.svelte +++ b/plugins/gmail-resources/src/components/NewMessage.svelte @@ -25,7 +25,7 @@ import { Integration } from '@hcengineering/setting' import templates, { TemplateDataProvider } from '@hcengineering/templates' import { EmptyMarkup, isEmptyMarkup, markupToHTML } from '@hcengineering/text' - import { StyledTextEditor } from '@hcengineering/text-editor' + import { StyledTextEditor } from '@hcengineering/text-editor-resources' import { Button, EditBox, IconArrowLeft, IconAttachment, Label, Scroller } from '@hcengineering/ui' import { createEventDispatcher, onDestroy } from 'svelte' import plugin from '../plugin' diff --git a/plugins/gmail-resources/src/components/NewMessages.svelte b/plugins/gmail-resources/src/components/NewMessages.svelte index 38c3693d2a..3ecd942116 100644 --- a/plugins/gmail-resources/src/components/NewMessages.svelte +++ b/plugins/gmail-resources/src/components/NewMessages.svelte @@ -23,7 +23,8 @@ import { createQuery, getClient } from '@hcengineering/presentation' import setting, { Integration } from '@hcengineering/setting' import templates, { TemplateDataProvider } from '@hcengineering/templates' - import { EmptyMarkup, StyledTextEditor, isEmptyMarkup } from '@hcengineering/text-editor' + import { StyledTextEditor } from '@hcengineering/text-editor-resources' + import { EmptyMarkup, isEmptyMarkup, markupToHTML } from '@hcengineering/text' import { Button, EditBox, @@ -38,7 +39,6 @@ import plugin from '../plugin' import Connect from './Connect.svelte' import IntegrationSelector from './IntegrationSelector.svelte' - import { markupToHTML } from '@hcengineering/text' export let value: Contact[] | Contact const contacts = Array.isArray(value) ? value : [value] diff --git a/plugins/hr-resources/package.json b/plugins/hr-resources/package.json index cdf8309cde..25bf24000c 100644 --- a/plugins/hr-resources/package.json +++ b/plugins/hr-resources/package.json @@ -53,7 +53,7 @@ "@hcengineering/attachment-resources": "^0.6.0", "@hcengineering/workbench-resources": "^0.6.1", "@hcengineering/text": "^0.6.5", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/setting": "^0.6.17", "@hcengineering/attachment": "^0.6.14", "@hcengineering/tracker": "^0.6.24" diff --git a/plugins/hr-resources/src/components/CreateRequest.svelte b/plugins/hr-resources/src/components/CreateRequest.svelte index ed162f00ae..f2c1ec79fe 100644 --- a/plugins/hr-resources/src/components/CreateRequest.svelte +++ b/plugins/hr-resources/src/components/CreateRequest.svelte @@ -21,7 +21,7 @@ import { Request, RequestType, Staff, timeToTzDate } from '@hcengineering/hr' import { translate } from '@hcengineering/platform' import { Card, createQuery, getClient } from '@hcengineering/presentation' - import { EmptyMarkup } from '@hcengineering/text-editor' + import { EmptyMarkup } from '@hcengineering/text' import ui, { Button, DateRangePresenter, diff --git a/plugins/hr-resources/src/components/EditRequest.svelte b/plugins/hr-resources/src/components/EditRequest.svelte index 5f1e944048..0f6cf849c9 100644 --- a/plugins/hr-resources/src/components/EditRequest.svelte +++ b/plugins/hr-resources/src/components/EditRequest.svelte @@ -16,7 +16,7 @@ import core from '@hcengineering/core' import { Request } from '@hcengineering/hr' import { getClient } from '@hcengineering/presentation' - import { StyledTextArea } from '@hcengineering/text-editor' + import { StyledTextArea } from '@hcengineering/text-editor-resources' import { createFocusManager, FocusHandler } from '@hcengineering/ui' import { createEventDispatcher, onMount } from 'svelte' diff --git a/plugins/lead-resources/package.json b/plugins/lead-resources/package.json index bffe4e59ab..5a813e9a9a 100644 --- a/plugins/lead-resources/package.json +++ b/plugins/lead-resources/package.json @@ -52,7 +52,7 @@ "@hcengineering/presentation": "^0.6.3", "@hcengineering/task": "^0.6.20", "@hcengineering/task-resources": "^0.6.0", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/ui": "^0.6.15", "@hcengineering/view": "^0.6.13", "@hcengineering/view-resources": "^0.6.0", diff --git a/plugins/lead-resources/src/components/EditFunnel.svelte b/plugins/lead-resources/src/components/EditFunnel.svelte index 583be5d926..638363792c 100644 --- a/plugins/lead-resources/src/components/EditFunnel.svelte +++ b/plugins/lead-resources/src/components/EditFunnel.svelte @@ -21,7 +21,7 @@ import { createQuery, getClient } from '@hcengineering/presentation' import { MembersBox } from '@hcengineering/contact-resources' import type { Funnel } from '@hcengineering/lead' - import { FullDescriptionBox } from '@hcengineering/text-editor' + import { FullDescriptionBox } from '@hcengineering/text-editor-resources' import { EditBox, Grid } from '@hcengineering/ui' import { ClassAttributeBar } from '@hcengineering/view-resources' import { createEventDispatcher } from 'svelte' diff --git a/plugins/products-resources/package.json b/plugins/products-resources/package.json index 55ce6b8bba..1237c9dde1 100644 --- a/plugins/products-resources/package.json +++ b/plugins/products-resources/package.json @@ -49,7 +49,7 @@ "@hcengineering/view-resources": "^0.6.0", "@hcengineering/view": "^0.6.13", "@hcengineering/panel": "^0.6.23", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/workbench": "^0.6.16", "@hcengineering/workbench-resources": "^0.6.1", "@hcengineering/tags": "^0.6.16", diff --git a/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte b/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte index be56abe22e..e4d64cb6f9 100644 --- a/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte +++ b/plugins/products-resources/src/components/product-version/CreateProductVersion.svelte @@ -28,7 +28,7 @@ import { Product, ProductVersion, ProductVersionState } from '@hcengineering/products' import { Data, Ref, SortingOrder, generateId } from '@hcengineering/core' import { Card, MessageBox, SpaceSelector, createQuery, getClient } from '@hcengineering/presentation' - import { StyledTextBox } from '@hcengineering/text-editor' + import { StyledTextBox } from '@hcengineering/text-editor-resources' import { DropdownLabelsIntl, EditBox, FocusHandler, createFocusManager, showPopup } from '@hcengineering/ui' import { ObjectBox } from '@hcengineering/view-resources' diff --git a/plugins/questions-resources/package.json b/plugins/questions-resources/package.json index 0cb2e11c43..2784c503e5 100644 --- a/plugins/questions-resources/package.json +++ b/plugins/questions-resources/package.json @@ -39,7 +39,7 @@ "@hcengineering/core": "^0.6.32", "@hcengineering/platform": "^0.6.11", "@hcengineering/presentation": "^0.6.3", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/theme": "^0.6.5", "@hcengineering/ui": "^0.6.15", "@hcengineering/view": "^0.6.13", diff --git a/plugins/recruit-resources/package.json b/plugins/recruit-resources/package.json index 1db8709e3b..7e1a28e23d 100644 --- a/plugins/recruit-resources/package.json +++ b/plugins/recruit-resources/package.json @@ -58,7 +58,8 @@ "@hcengineering/tags-resources": "^0.6.0", "@hcengineering/task": "^0.6.20", "@hcengineering/task-resources": "^0.6.0", - "@hcengineering/text-editor": "^0.6.0", + "@hcengineering/text": "^0.6.5", + "@hcengineering/text-editor-resources": "^0.6.0", "@hcengineering/tracker": "^0.6.24", "@hcengineering/ui": "^0.6.15", "@hcengineering/view": "^0.6.13", diff --git a/plugins/recruit-resources/src/components/CreateApplication.svelte b/plugins/recruit-resources/src/components/CreateApplication.svelte index d2d3f5e7f3..8df866ad83 100644 --- a/plugins/recruit-resources/src/components/CreateApplication.svelte +++ b/plugins/recruit-resources/src/components/CreateApplication.svelte @@ -46,7 +46,7 @@ import type { Applicant, Candidate, Vacancy } from '@hcengineering/recruit' import task, { TaskType, getStates, makeRank } from '@hcengineering/task' import { TaskKindSelector, selectedTypeStore, typeStore } from '@hcengineering/task-resources' - import { EmptyMarkup } from '@hcengineering/text-editor' + import { EmptyMarkup } from '@hcengineering/text' import ui, { Button, ColorPopup, diff --git a/plugins/recruit-resources/src/components/VacancyTemplateEditor.svelte b/plugins/recruit-resources/src/components/VacancyTemplateEditor.svelte index 99279a8e41..55c7de498d 100644 --- a/plugins/recruit-resources/src/components/VacancyTemplateEditor.svelte +++ b/plugins/recruit-resources/src/components/VacancyTemplateEditor.svelte @@ -15,7 +15,7 @@ diff --git a/packages/text-editor/src/components/CollaborationUsers.svelte b/plugins/text-editor-resources/src/components/CollaborationUsers.svelte similarity index 98% rename from packages/text-editor/src/components/CollaborationUsers.svelte rename to plugins/text-editor-resources/src/components/CollaborationUsers.svelte index 6db5654b95..b3beced048 100644 --- a/packages/text-editor/src/components/CollaborationUsers.svelte +++ b/plugins/text-editor-resources/src/components/CollaborationUsers.svelte @@ -23,7 +23,7 @@ import { relativePositionToAbsolutePosition, ySyncPluginKey } from 'y-prosemirror' import { TiptapCollabProvider } from '../provider/tiptap' - import { AwarenessChangeEvent, CollaborationUserState } from '../types' + import { AwarenessChangeEvent, CollaborationUserState } from '@hcengineering/text-editor' export let provider: TiptapCollabProvider export let editor: Editor diff --git a/packages/text-editor/src/components/CollaborativeAttributeBox.svelte b/plugins/text-editor-resources/src/components/CollaborativeAttributeBox.svelte similarity index 93% rename from packages/text-editor/src/components/CollaborativeAttributeBox.svelte rename to plugins/text-editor-resources/src/components/CollaborativeAttributeBox.svelte index 06a2b93c69..fb78e0c973 100644 --- a/packages/text-editor/src/components/CollaborativeAttributeBox.svelte +++ b/plugins/text-editor-resources/src/components/CollaborativeAttributeBox.svelte @@ -1,5 +1,5 @@ -{#if textEditor} - {#if textEditor.isActive('image')} +{#if editor} + {#if editor.isActive('image')}
@@ -115,20 +115,20 @@ icon={IconScaleOut} size={formatButtonSize} on:click={openImage} - showTooltip={{ label: plugin.string.ViewImage }} + showTooltip={{ label: textEditor.string.ViewImage }} />
{/if} {/if} diff --git a/packages/text-editor/src/components/InlineCommandsList.svelte b/plugins/text-editor-resources/src/components/InlineCommandsList.svelte similarity index 98% rename from packages/text-editor/src/components/InlineCommandsList.svelte rename to plugins/text-editor-resources/src/components/InlineCommandsList.svelte index 2db9370b53..57ecc2dbb1 100644 --- a/packages/text-editor/src/components/InlineCommandsList.svelte +++ b/plugins/text-editor-resources/src/components/InlineCommandsList.svelte @@ -1,6 +1,6 @@ { diff --git a/packages/text-editor/src/components/MarkupDiffViewer.svelte b/plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte similarity index 94% rename from packages/text-editor/src/components/MarkupDiffViewer.svelte rename to plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte index c79c94d6c7..a6e41e515d 100644 --- a/packages/text-editor/src/components/MarkupDiffViewer.svelte +++ b/plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte @@ -23,7 +23,7 @@ import { calculateDecorations } from './diff/decorations' import { defaultEditorAttributes } from './editor/editorProps' - import { EditorKit } from '../kits/editor-kit' + import { getEditorKit } from '../../src/kits/editor-kit' export let content: MarkupNode export let comparedVersion: MarkupNode | undefined = undefined @@ -73,13 +73,13 @@ updateEditor(editor, comparedVersion) } - onMount(() => { + onMount(async () => { editor = new Editor({ editorProps: { attributes: mergeAttributes(defaultEditorAttributes, { class: 'flex-grow' }) }, element, content, editable: false, - extensions: [EditorKit, ReferenceNode, DecorationExtension], + extensions: [await getEditorKit(), ReferenceNode, DecorationExtension], onTransaction: () => { // force re-render so `editor.isActive` works as expected editor = editor diff --git a/packages/text-editor/src/components/MentionList.svelte b/plugins/text-editor-resources/src/components/MentionList.svelte similarity index 98% rename from packages/text-editor/src/components/MentionList.svelte rename to plugins/text-editor-resources/src/components/MentionList.svelte index fe35c43b40..55e491e7b8 100644 --- a/packages/text-editor/src/components/MentionList.svelte +++ b/plugins/text-editor-resources/src/components/MentionList.svelte @@ -1,6 +1,6 @@