Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

internal/tailwind-config/src/index.ts

@@ -1,6 +1,5 @@
 import type { Config } from 'tailwindcss';
 
-import fs from 'node:fs';
 import path from 'node:path';
 
 import { getPackagesSync } from '@vben/node-utils';
@@ -19,9 +18,9 @@ const tailwindPackages: string[] = [];
 
 packages.forEach((pkg) => {
   // apps目录下和 @vben-core/tailwind-ui 包需要使用到 tailwindcss ui
-  if (fs.existsSync(path.join(pkg.dir, 'tailwind.config.mjs'))) {
-    tailwindPackages.push(pkg.dir);
-  }
+  // if (fs.existsSync(path.join(pkg.dir, 'tailwind.config.mjs'))) {
+  tailwindPackages.push(pkg.dir);
+  // }
 });
 
 const shadcnUiColors = {

internal/vite-config/package.json

@@ -40,6 +40,7 @@
     "vite-plugin-vue-devtools": "catalog:"
   },
   "devDependencies": {
+    "@pnpm/workspace.read-manifest": "catalog:",
     "@types/archiver": "catalog:",
     "@types/html-minifier-terser": "catalog:",
     "@vben/node-utils": "workspace:*",

internal/vite-config/src/plugins/inject-metadata.ts

@@ -1,20 +1,35 @@
 import type { PluginOption } from 'vite';
 
-import { dateUtil, getPackages, readPackageJSON } from '@vben/node-utils';
+import {
+  dateUtil,
+  findMonorepoRoot,
+  getPackages,
+  readPackageJSON,
+} from '@vben/node-utils';
+
+import { readWorkspaceManifest } from '@pnpm/workspace.read-manifest';
 
 function resolvePackageVersion(
   pkgsMeta: Record<string, string>,
   name: string,
   value: string,
+  catalog: Record<string, string>,
 ) {
+  if (value.includes('catalog:')) {
+    return catalog[name];
+  }
+
   if (value.includes('workspace')) {
     return pkgsMeta[name];
   }
+
   return value;
 }
 
 async function resolveMonorepoDependencies() {
   const { packages } = await getPackages();
+  const manifest = await readWorkspaceManifest(findMonorepoRoot());
+  const catalog = manifest?.catalog || {};
 
   const resultDevDependencies: Record<string, string | undefined> = {};
   const resultDependencies: Record<string, string | undefined> = {};
@@ -27,10 +42,20 @@ async function resolveMonorepoDependencies() {
   for (const { packageJson } of packages) {
     const { dependencies = {}, devDependencies = {} } = packageJson;
     for (const [key, value] of Object.entries(dependencies)) {
-      resultDependencies[key] = resolvePackageVersion(pkgsMeta, key, value);
+      resultDependencies[key] = resolvePackageVersion(
+        pkgsMeta,
+        key,
+        value,
+        catalog,
+      );
     }
     for (const [key, value] of Object.entries(devDependencies)) {
-      resultDevDependencies[key] = resolvePackageVersion(pkgsMeta, key, value);
+      resultDevDependencies[key] = resolvePackageVersion(
+        pkgsMeta,
+        key,
+        value,
+        catalog,
+      );
     }
   }
   return {