From 18e7a34849c562b23e83eaa30cb26fa2a6e09e37 Mon Sep 17 00:00:00 2001 From: ybzky Date: Sat, 19 Oct 2024 16:23:56 +0800 Subject: [PATCH] chore: update dependency --- pnpm-lock.yaml | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea063a43244c..3715f40298cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,7 +28,7 @@ importers: version: 4.2.0(release-it@17.8.2(typescript@5.6.3)) '@release-it/conventional-changelog': specifier: ^8.0.2 - version: 8.0.2(release-it@17.8.2(typescript@5.6.3)) + version: 8.0.2(conventional-commits-filter@4.0.0)(conventional-commits-parser@5.0.0)(release-it@17.8.2(typescript@5.6.3)) '@storybook/react': specifier: 8.3.5 version: 8.3.5(@storybook/test@8.3.5(storybook@8.3.5))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(storybook@8.3.5)(typescript@5.6.3) @@ -5227,19 +5227,14 @@ packages: react: '*' react-dom: '*' -<<<<<<< HEAD - '@univerjs/protocol@0.1.39-alpha.30': - resolution: {integrity: sha512-mgA8MvuYTWc+E5Fedi45oLKMDBjFzEwOLpFSSZrvzA+rqRnXeVZY21wSOZPHSb+GlIKdNxVtdhg3/ahhVaKJvA==} -======= '@univerjs/icons@0.1.80': resolution: {integrity: sha512-6lR/dhGkGWbahgpdDdf/xEpDJxcRllIQTnknR9pNyo+4VdO/QrVaI3a2NgebY+0VQTD2rX5CuKKJhbkAdzXQdA==} peerDependencies: react: '*' react-dom: '*' - '@univerjs/protocol@0.1.39-alpha.15': - resolution: {integrity: sha512-vNV9y+5qGbzOAkGn1Na/DhWWqDLPyUHVZkC5xKUZxp9Df8Em190A9qQcNw+szaudSwotLHtqDSJLDlPUy4g3Jg==} ->>>>>>> 031b7b8e6 (chore: add menu hidden mark) + '@univerjs/protocol@0.1.39-alpha.30': + resolution: {integrity: sha512-mgA8MvuYTWc+E5Fedi45oLKMDBjFzEwOLpFSSZrvzA+rqRnXeVZY21wSOZPHSb+GlIKdNxVtdhg3/ahhVaKJvA==} engines: {node: '>=16.0.0', npm: '>=8.0.0'} peerDependencies: '@grpc/grpc-js': 1.9.14 @@ -10887,10 +10882,13 @@ snapshots: '@types/conventional-commits-parser': 5.0.0 chalk: 5.3.0 - '@conventional-changelog/git-client@1.0.1': + '@conventional-changelog/git-client@1.0.1(conventional-commits-filter@4.0.0)(conventional-commits-parser@5.0.0)': dependencies: '@types/semver': 7.5.8 semver: 7.6.3 + optionalDependencies: + conventional-commits-filter: 4.0.0 + conventional-commits-parser: 5.0.0 '@dprint/formatter@0.3.0': {} @@ -11586,12 +11584,12 @@ snapshots: walk-sync: 2.2.0 yaml: 2.4.5 - '@release-it/conventional-changelog@8.0.2(release-it@17.8.2(typescript@5.6.3))': + '@release-it/conventional-changelog@8.0.2(conventional-commits-filter@4.0.0)(conventional-commits-parser@5.0.0)(release-it@17.8.2(typescript@5.6.3))': dependencies: concat-stream: 2.0.0 conventional-changelog: 5.1.0 conventional-recommended-bump: 9.0.0 - git-semver-tags: 8.0.0 + git-semver-tags: 8.0.0(conventional-commits-filter@4.0.0)(conventional-commits-parser@5.0.0) release-it: 17.8.2(typescript@5.6.3) semver: 7.6.3 transitivePeerDependencies: @@ -12457,16 +12455,12 @@ snapshots: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) -<<<<<<< HEAD - '@univerjs/protocol@0.1.39-alpha.30(@grpc/grpc-js@1.10.9)(rxjs@7.8.1)': -======= '@univerjs/icons@0.1.80(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - '@univerjs/protocol@0.1.39-alpha.15(@grpc/grpc-js@1.10.9)(rxjs@7.8.1)': ->>>>>>> 031b7b8e6 (chore: add menu hidden mark) + '@univerjs/protocol@0.1.39-alpha.30(@grpc/grpc-js@1.10.9)(rxjs@7.8.1)': dependencies: '@grpc/grpc-js': 1.10.9 rxjs: 7.8.1 @@ -14931,9 +14925,9 @@ snapshots: meow: 12.1.1 semver: 7.6.3 - git-semver-tags@8.0.0: + git-semver-tags@8.0.0(conventional-commits-filter@4.0.0)(conventional-commits-parser@5.0.0): dependencies: - '@conventional-changelog/git-client': 1.0.1 + '@conventional-changelog/git-client': 1.0.1(conventional-commits-filter@4.0.0)(conventional-commits-parser@5.0.0) meow: 13.2.0 transitivePeerDependencies: - conventional-commits-filter