From 8267755d06479280a859a6597ca8c0aa2f0508e7 Mon Sep 17 00:00:00 2001 From: underfin Date: Fri, 26 Jul 2024 19:33:20 +0800 Subject: [PATCH] chore: rebase --- pnpm-lock.yaml | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93ee92b4e0b10c..16d30f6d8b37ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2877,15 +2877,6 @@ packages: cpu: [x64] os: [win32] - '@rollup/plugin-alias@5.0.0': - resolution: {integrity: sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - '@rollup/plugin-alias@5.1.0': resolution: {integrity: sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==} engines: {node: '>=14.0.0'} @@ -5124,10 +5115,6 @@ packages: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} engines: {node: '>= 12.13.0'} - local-pkg@0.5.0: - resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} - engines: {node: '>=14'} - locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} @@ -5974,28 +5961,15 @@ packages: deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true -<<<<<<< HEAD rimraf@5.0.9: resolution: {integrity: sha512-3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA==} engines: {node: 14 >=14.20 || 16 >=16.20 || >=18} -======= - rimraf@5.0.7: - resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==} - engines: {node: '>=14.18'} hasBin: true rolldown@0.12.2: resolution: {integrity: sha512-YJYKiYt2O9XytiQ3Na4Kk29avfIXhvK7udB3wAaVaF4kiSsFKE1167tElO/0eD6tjfJXCvwNxwsyYkBJRtsLmQ==} ->>>>>>> f35336e4e (chore: using latest rolldown) hasBin: true - rollup-plugin-dts@6.0.2: - resolution: {integrity: sha512-GYCCy9DyE5csSuUObktJBpjNpW2iLZMabNDIiAqzQWBl7l/WHzjvtAXevf8Lftk8EA920tuxeB/g8dM8MVMR6A==} - engines: {node: '>=v16'} - peerDependencies: - rollup: ^3.25 - typescript: ^4.5 || ^5.0 - rollup-plugin-dts@6.1.1: resolution: {integrity: sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA==} engines: {node: '>=16'} @@ -8040,8 +8014,6 @@ snapshots: '@polka/url@1.0.0-next.24': {} -<<<<<<< HEAD -======= '@rolldown/binding-darwin-arm64@0.12.2': optional: true @@ -8080,8 +8052,7 @@ snapshots: '@rolldown/binding-win32-x64-msvc@0.12.2': optional: true ->>>>>>> f35336e4e (chore: using latest rolldown) - '@rollup/plugin-alias@5.0.0(rollup@3.29.4)': + '@rollup/plugin-alias@5.1.0(rollup@3.29.4)': dependencies: slash: 4.0.0 optionalDependencies: @@ -10512,11 +10483,6 @@ snapshots: loader-utils@3.2.1: {} - local-pkg@0.5.0: - dependencies: - mlly: 1.7.1 - pkg-types: 1.0.3 - locate-path@6.0.0: dependencies: p-locate: 5.0.0 @@ -11489,10 +11455,7 @@ snapshots: rimraf@5.0.9: dependencies: -<<<<<<< HEAD glob: 10.4.5 -======= - glob: 10.3.10 rolldown@0.12.2: dependencies: @@ -11510,9 +11473,8 @@ snapshots: '@rolldown/binding-win32-arm64-msvc': 0.12.2 '@rolldown/binding-win32-ia32-msvc': 0.12.2 '@rolldown/binding-win32-x64-msvc': 0.12.2 ->>>>>>> f35336e4e (chore: using latest rolldown) - rollup-plugin-dts@6.0.2(rollup@3.29.4)(typescript@5.2.2): + rollup-plugin-dts@6.1.1(rollup@3.29.4)(typescript@5.5.3): dependencies: magic-string: 0.30.10 rollup: 3.29.4