chore(ui): fix optionalDependencies

dream-num · Mar 29, 2024 · 8520a9c · 8520a9c
1 parent d8c9e4b
commit 8520a9c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git 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
@@ -74,15 +74,17 @@
  "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",
  "localforage": "^1.10.0",
  "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",