Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

chore(ui): fix optionalDependencies

白熱a91f5740cffe
diff --git a/common/shared/vite/auto-externalize-dependency-plugin.js b/common/shared/vite/auto-externalize-dependency-plugin.js
index eab4104173..ccab65ff3c 100644
--- a/common/shared/vite/auto-externalize-dependency-plugin.js
+++ b/common/shared/vite/auto-externalize-dependency-plugin.js
@@ -62,6 +62,7 @@ exports.autoExternalizeDependency = function autoExternalizeDependency() {
global: 'Vue',
name: 'vue',
version: '>=3.0.0',
+ optional: true,
},
};
@@ -112,15 +113,23 @@ exports.autoExternalizeDependency = function autoExternalizeDependency() {
// generate peerDependencies
const pkg = require(`${process.cwd()}/package.json`);
const peerDependencies = {};
+ let optionalDependencies;
Array.from(externals)
.sort()
.forEach((ext) => {
- const { version, name } = externalMap[ext] ?? {};
+ const { version, name, optional } = externalMap[ext] ?? {};
if (version) {
if (version !== name) {
- peerDependencies[ext] = version;
+ if (optional) {
+ if (!optionalDependencies) {
+ optionalDependencies = {};
+ }
+ optionalDependencies[ext] = version;
+ } else {
+ peerDependencies[ext] = version;
+ }
} else {
if (!peerDependencies[version]) {
peerDependencies[name] = externalMap[version].version;
@@ -132,6 +141,9 @@ exports.autoExternalizeDependency = function autoExternalizeDependency() {
});
pkg.peerDependencies = peerDependencies;
+ if (optionalDependencies) {
+ pkg.optionalDependencies = optionalDependencies;
+ }
writeFileSync(
`${process.cwd()}/package.json`,
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 902dbe5590..0c117fc7f9 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -74,8 +74,7 @@
"clsx": ">=2.0.0",
"react": ">=16.9.0",
"react-dom": ">=16.9.0",
- "rxjs": ">=7.0.0",
- "vue": ">=3.0.0"
+ "rxjs": ">=7.0.0"
},
"dependencies": {
"@univerjs/icons": "^0.1.42",
@@ -83,6 +82,9 @@
"rc-notification": "^5.4.0",
"rc-util": "^5.39.1"
},
+ "optionalDependencies": {
+ "vue": ">=3.0.0"
+ },
"devDependencies": {
"@testing-library/react": "^14.2.1",
"@testing-library/react-hooks": "^8.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f0a2b3dcc7..8ee8eb123c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1218,6 +1218,10 @@ importers:
rc-util:
specifier: ^5.39.1
+ optionalDependencies:
+ vue:
+ specifier: '>=3.0.0'
+ version: 3.4.21([email protected])
devDependencies:
'@testing-library/react':
specifier: ^14.2.1
@@ -1276,9 +1280,6 @@ importers:
vitest:
specifier: ^1.4.0
version: 1.4.0(@types/[email protected])([email protected])
- vue:
- specifier: ^3.4.21
- version: 3.4.21([email protected])
packages/uniscript:
dependencies:
@@ -6051,7 +6052,7 @@ packages:
'@vue/shared': 3.4.21
entities: 4.5.0
estree-walker: 2.0.2
- source-map-js: 1.0.2
+ source-map-js: 1.2.0
resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==}
@@ -6069,8 +6070,8 @@ packages:
'@vue/shared': 3.4.21
estree-walker: 2.0.2
magic-string: 0.30.8
- postcss: 8.4.35
- source-map-js: 1.0.2
+ postcss: 8.4.38
+ source-map-js: 1.2.0
resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==}
@@ -12364,6 +12365,7 @@ packages:
nanoid: 3.3.7
picocolors: 1.0.0
source-map-js: 1.0.2
+ dev: false
resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}