diff --git a/packages/debugger/package.json b/packages/debugger/package.json index bced96ac48f..d1e9b470e2b 100644 --- a/packages/debugger/package.json +++ b/packages/debugger/package.json @@ -58,7 +58,6 @@ "@univerjs/core": "workspace:*", "@univerjs/design": "workspace:*", "@univerjs/engine-render": "workspace:*", - "@univerjs/protocol": "0.1.39-alpha.15", "@univerjs/sheets": "workspace:*", "@univerjs/sheets-drawing-ui": "workspace:*", "@univerjs/ui": "workspace:*", diff --git a/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts b/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts index 10c98279a41..c3e2396a814 100644 --- a/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts +++ b/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts @@ -15,7 +15,6 @@ */ import { Disposable, ICommandService, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType } from '@univerjs/core'; -import { UniverType } from '@univerjs/protocol'; import { DisposeUniverCommand } from '../../commands/commands/unit.command'; import { getDefaultWorkbookData } from './data/default-sheet'; import { getDefaultDocData } from './data/default-doc'; @@ -96,7 +95,7 @@ export class E2EMemoryController extends Disposable { } private async _diposeDefaultSheetUnit(disposingTimeout: number = AWAIT_DISPOSING_TIMEOUT): Promise { - const unit = this._univerInstanceService.getCurrentUnitForType(UniverType.UNIVER_SHEET); + const unit = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET); const unitId = unit?.getUnitId(); await this._univerInstanceService.disposeUnit(unitId || ''); await timer(disposingTimeout); diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index 1d273dc719e..6e15c211cc6 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -1,7 +1,7 @@ { "name": "@univerjs/telemetry", "version": "0.2.11", - "private": true, + "private": false, "description": "", "author": "DreamNum ", "funding": { @@ -79,16 +79,5 @@ "types": "./lib/types/index.d.ts" }, "./lib/*": "./lib/*" - }, - "univer": { - ".": { - "import": "./lib/es/index.js", - "types": "./src/index.ts" - }, - "./*": { - "import": "./lib/es/*", - "types": "./src/index.ts" - }, - "./lib/*": "./lib/*" } } diff --git a/packages/umd/package.json b/packages/umd/package.json index ea8832304c5..b6ed0771f43 100644 --- a/packages/umd/package.json +++ b/packages/umd/package.json @@ -44,6 +44,8 @@ "@univerjs/docs": "workspace:*", "@univerjs/docs-drawing": "workspace:*", "@univerjs/docs-drawing-ui": "workspace:*", + "@univerjs/docs-hyper-link": "workspace:*", + "@univerjs/docs-hyper-link-ui": "workspace:*", "@univerjs/docs-thread-comment-ui": "workspace:*", "@univerjs/docs-ui": "workspace:*", "@univerjs/drawing": "workspace:*", @@ -78,6 +80,7 @@ "@univerjs/sheets-zen-editor": "workspace:*", "@univerjs/slides": "workspace:*", "@univerjs/slides-ui": "workspace:*", + "@univerjs/telemetry": "workspace:*", "@univerjs/thread-comment": "workspace:*", "@univerjs/thread-comment-ui": "workspace:*", "@univerjs/ui": "workspace:*", diff --git a/packages/umd/scripts/index.mjs b/packages/umd/scripts/index.mjs index 3ebd1e26f9c..7a6c59b4088 100644 --- a/packages/umd/scripts/index.mjs +++ b/packages/umd/scripts/index.mjs @@ -193,6 +193,7 @@ function buildJS() { const libs = [ '@univerjs/protocol', '@univerjs/core', + '@univerjs/telemetry', '@univerjs/rpc', '@univerjs/design', '@univerjs/engine-render', @@ -229,6 +230,7 @@ function buildJS() { '@univerjs/sheets-drawing-ui', '@univerjs/docs-drawing', '@univerjs/docs-drawing-ui', + '@univerjs/docs-hyper-link', '@univerjs/docs-hyper-link-ui', '@univerjs/slides', '@univerjs/slides-ui', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9878b373b55..ba695612cd5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -810,9 +810,6 @@ importers: '@univerjs/design': specifier: workspace:* version: link:../design - '@univerjs/protocol': - specifier: 0.1.39-alpha.15 - version: 0.1.39-alpha.15(@grpc/grpc-js@1.10.9)(rxjs@7.8.1) react: specifier: ^16.9.0 || ^17.0.0 || ^18.0.0 version: 18.3.1 @@ -2916,6 +2913,12 @@ importers: '@univerjs/docs-drawing-ui': specifier: workspace:* version: link:../docs-drawing-ui + '@univerjs/docs-hyper-link': + specifier: workspace:* + version: link:../docs-hyper-link + '@univerjs/docs-hyper-link-ui': + specifier: workspace:* + version: link:../docs-hyper-link-ui '@univerjs/docs-thread-comment-ui': specifier: workspace:* version: link:../docs-thread-comment-ui @@ -3018,6 +3021,9 @@ importers: '@univerjs/slides-ui': specifier: workspace:* version: link:../slides-ui + '@univerjs/telemetry': + specifier: workspace:* + version: link:../telemetry '@univerjs/thread-comment': specifier: workspace:* version: link:../thread-comment @@ -4418,72 +4424,84 @@ packages: engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-arm@1.0.2': resolution: {integrity: sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw==} engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-s390x@1.0.2': resolution: {integrity: sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog==} engines: {glibc: '>=2.28', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-libvips-linux-x64@1.0.2': resolution: {integrity: sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==} engines: {glibc: '>=2.26', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-libvips-linuxmusl-arm64@1.0.2': resolution: {integrity: sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ==} engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-libvips-linuxmusl-x64@1.0.2': resolution: {integrity: sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw==} engines: {musl: '>=1.2.2', npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-linux-arm64@0.33.4': resolution: {integrity: sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==} engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@img/sharp-linux-arm@0.33.4': resolution: {integrity: sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==} engines: {glibc: '>=2.28', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm] os: [linux] + libc: [glibc] '@img/sharp-linux-s390x@0.33.4': resolution: {integrity: sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==} engines: {glibc: '>=2.31', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [s390x] os: [linux] + libc: [glibc] '@img/sharp-linux-x64@0.33.4': resolution: {integrity: sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==} engines: {glibc: '>=2.26', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [glibc] '@img/sharp-linuxmusl-arm64@0.33.4': resolution: {integrity: sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==} engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [arm64] os: [linux] + libc: [musl] '@img/sharp-linuxmusl-x64@0.33.4': resolution: {integrity: sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==} engines: {musl: '>=1.2.2', node: ^18.17.0 || ^20.3.0 || >=21.0.0, npm: '>=9.6.5', pnpm: '>=7.1.0', yarn: '>=3.2.0'} cpu: [x64] os: [linux] + libc: [musl] '@img/sharp-wasm32@0.33.4': resolution: {integrity: sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==} @@ -4769,46 +4787,55 @@ packages: resolution: {integrity: sha512-sWWgdQ1fq+XKrlda8PsMCfut8caFwZBmhYeoehJ05FdI0YZXk6ZyUjWLrIgbR/VgiGycrFKMMgp7eJ69HOF2pQ==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.21.1': resolution: {integrity: sha512-9OIiSuj5EsYQlmwhmFRA0LRO0dRRjdCVZA3hnmZe1rEwRk11Jy3ECGGq3a7RrVEZ0/pCsYWx8jG3IvcrJ6RCew==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.21.1': resolution: {integrity: sha512-0kuAkRK4MeIUbzQYu63NrJmfoUVicajoRAL1bpwdYIYRcs57iyIV9NLcuyDyDXE2GiZCL4uhKSYAnyWpjZkWow==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.21.1': resolution: {integrity: sha512-/6dYC9fZtfEY0vozpc5bx1RP4VrtEOhNQGb0HwvYNwXD1BBbwQ5cKIbUVVU7G2d5WRE90NfB922elN8ASXAJEA==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-powerpc64le-gnu@4.21.1': resolution: {integrity: sha512-ltUWy+sHeAh3YZ91NUsV4Xg3uBXAlscQe8ZOXRCVAKLsivGuJsrkawYPUEyCV3DYa9urgJugMLn8Z3Z/6CeyRQ==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.21.1': resolution: {integrity: sha512-BggMndzI7Tlv4/abrgLwa/dxNEMn2gC61DCLrTzw8LkpSKel4o+O+gtjbnkevZ18SKkeN3ihRGPuBxjaetWzWg==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.21.1': resolution: {integrity: sha512-z/9rtlGd/OMv+gb1mNSjElasMf9yXusAxnRDrBaYB+eS1shFm6/4/xDH1SAISO5729fFKUkJ88TkGPRUh8WSAA==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.21.1': resolution: {integrity: sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.21.1': resolution: {integrity: sha512-CbFv/WMQsSdl+bpX6rVbzR4kAjSSBuDgCqb1l4J68UYsQNalz5wOqLGYj4ZI0thGpyX5kc+LLZ9CL+kpqDovZA==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.21.1': resolution: {integrity: sha512-3Q3brDgA86gHXWHklrwdREKIrIbxC0ZgU8lwpj0eEKGBQH+31uPqr0P2v11pn0tSIxHvcdOWxa4j+YvLNx1i6g==} @@ -5120,24 +5147,28 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [glibc] '@swc/core-linux-arm64-musl@1.7.5': resolution: {integrity: sha512-5ArGdqvFMszNHdi4a67vopeYq8d1K+FuTWDrblHrAvZFhAyv+GQz2PnKqYOgl0sWmQxsNPfNwBFtxACpUO3Jzg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [musl] '@swc/core-linux-x64-gnu@1.7.5': resolution: {integrity: sha512-mSVVV/PFzCGtI1nVQQyx34NwCMgSurF6ZX/me8pUAX054vsE/pSFL66xN+kQOe/1Z/LOd4UmXFkZ/EzOSnYcSg==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [glibc] '@swc/core-linux-x64-musl@1.7.5': resolution: {integrity: sha512-09hY3ZKMUORXVunESKS9yuP78+gQbr759GKHo8wyCdtAx8lCZdEjfI5NtC7/1VqwfeE32/U6u+5MBTVhZTt0AA==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [musl] '@swc/core-win32-arm64-msvc@1.7.5': resolution: {integrity: sha512-B/UDtPI3RlYRFW42xQxOpl6kI/9LtkD7No+XeRIKQTPe15EP2o+rUlv7CmKljVBXgJ8KmaQbZlaEh1YP+QZEEQ==}