From 25a1e93ab2657e5b86f15eaf2bc1e093f10a4377 Mon Sep 17 00:00:00 2001
From: vince <vince292007@gmail.com>
Date: Wed, 10 Jul 2024 21:40:29 +0800
Subject: [PATCH] fix: optimize the dependency detection script prompt and fix
 the loop dependency problem

---
 package.json                                  |  2 +-
 packages/@core/forward/helpers/package.json   |  1 -
 packages/@core/locales/src/index.ts           |  3 +-
 .../src/components/ui/toast/Toast.vue         |  2 +-
 .../src/components/ui/toast/Toaster.vue       | 14 ++++----
 .../src/components/ui/toast/index.ts          | 32 ++-----------------
 .../src/components/ui/toast/toast.ts          | 29 +++++++++++++++++
 .../src/components/ui/toast/use-toast.ts      |  2 +-
 packages/icons/build.config.ts                |  1 +
 packages/icons/package.json                   |  3 +-
 pnpm-lock.yaml                                |  6 ----
 scripts/vsh/src/check-dep/index.ts            | 12 +++++++
 12 files changed, 56 insertions(+), 51 deletions(-)
 create mode 100644 packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/toast.ts

diff --git a/package.json b/package.json
index 9b480ecd..a16ab881 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build",
     "build:docker": "./build-local-docker-image.sh",
     "changeset": "pnpm exec changeset",
-    "check": "pnpm run check:dep && pnpm run check:circular && pnpm run check:type && pnpm run check:spell",
+    "check": "pnpm run check:dep && pnpm run check:circular && pnpm run check:type && pnpm run check:cspell",
     "check:circular": "vsh check-circular",
     "check:dep": "vsh check-dep",
     "check:cspell": "cspell lint \"**/*.ts\"  \"**/README.md\" \".changeset/*.md\" --no-progress",
diff --git a/packages/@core/forward/helpers/package.json b/packages/@core/forward/helpers/package.json
index 42ddabc7..07380e58 100644
--- a/packages/@core/forward/helpers/package.json
+++ b/packages/@core/forward/helpers/package.json
@@ -36,7 +36,6 @@
     }
   },
   "dependencies": {
-    "@vben-core/toolkit": "workspace:*",
     "@vben-core/typings": "workspace:*",
     "vue-router": "^4.4.0"
   }
diff --git a/packages/@core/locales/src/index.ts b/packages/@core/locales/src/index.ts
index 6e079cd8..480686e3 100644
--- a/packages/@core/locales/src/index.ts
+++ b/packages/@core/locales/src/index.ts
@@ -36,6 +36,7 @@ async function setupI18n(app: App, options: LocaleSetupOptions = {}) {
 }
 
 export { $t, i18n, loadLocaleMessages, loadLocalesMap, setupI18n };
+export type { CompileError } from '@intlify/core-base';
 export { useI18n } from 'vue-i18n';
-export type { Locale } from 'vue-i18n';
 export type { ImportLocaleFn };
+export type { Locale } from 'vue-i18n';
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue
index 9990f44f..d114de92 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue
@@ -9,7 +9,7 @@ import {
   useForwardPropsEmits,
 } from 'radix-vue';
 
-import { type ToastProps, toastVariants } from '.';
+import { type ToastProps, toastVariants } from './toast';
 
 const props = defineProps<ToastProps>();
 
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue
index bd8b647f..52c4a244 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue
@@ -1,14 +1,12 @@
 <script setup lang="ts">
 import { isVNode } from 'vue';
 
-import {
-  Toast,
-  ToastClose,
-  ToastDescription,
-  ToastProvider,
-  ToastTitle,
-  ToastViewport,
-} from '.';
+import Toast from './Toast.vue';
+import ToastClose from './ToastClose.vue';
+import ToastDescription from './ToastDescription.vue';
+import ToastProvider from './ToastProvider.vue';
+import ToastTitle from './ToastTitle.vue';
+import ToastViewport from './ToastViewport.vue';
 import { useToast } from './use-toast';
 
 const { toasts } = useToast();
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/index.ts b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/index.ts
index 3d660980..cebd6ce7 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/index.ts
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/index.ts
@@ -1,9 +1,3 @@
-import type { ToastRootProps } from 'radix-vue';
-
-import type { HTMLAttributes } from 'vue';
-
-import { type VariantProps, cva } from 'class-variance-authority';
-
 export { default as Toast } from './Toast.vue';
 export { default as ToastAction } from './ToastAction.vue';
 export { default as ToastClose } from './ToastClose.vue';
@@ -12,28 +6,6 @@ export { default as ToastProvider } from './ToastProvider.vue';
 export { default as ToastTitle } from './ToastTitle.vue';
 export { default as ToastViewport } from './ToastViewport.vue';
 export { default as Toaster } from './Toaster.vue';
+export * from './toast';
+
 export { toast, useToast } from './use-toast';
-
-export const toastVariants = cva(
-  'group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full',
-  {
-    defaultVariants: {
-      variant: 'default',
-    },
-    variants: {
-      variant: {
-        default: 'border bg-background border-border text-foreground',
-        destructive:
-          'destructive group border-destructive bg-destructive text-destructive-foreground',
-      },
-    },
-  },
-);
-
-type ToastVariants = VariantProps<typeof toastVariants>;
-
-export interface ToastProps extends ToastRootProps {
-  class?: HTMLAttributes['class'];
-  onOpenChange?: ((value: boolean) => void) | undefined;
-  variant?: ToastVariants['variant'];
-}
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/toast.ts b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/toast.ts
new file mode 100644
index 00000000..12e3860c
--- /dev/null
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/toast.ts
@@ -0,0 +1,29 @@
+import type { ToastRootProps } from 'radix-vue';
+
+import type { HTMLAttributes } from 'vue';
+
+import { type VariantProps, cva } from 'class-variance-authority';
+
+export const toastVariants = cva(
+  'group pointer-events-auto relative flex w-full items-center justify-between space-x-2 overflow-hidden rounded-md border p-4 pr-6 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full',
+  {
+    defaultVariants: {
+      variant: 'default',
+    },
+    variants: {
+      variant: {
+        default: 'border bg-background border-border text-foreground',
+        destructive:
+          'destructive group border-destructive bg-destructive text-destructive-foreground',
+      },
+    },
+  },
+);
+
+type ToastVariants = VariantProps<typeof toastVariants>;
+
+export interface ToastProps extends ToastRootProps {
+  class?: HTMLAttributes['class'];
+  onOpenChange?: ((value: boolean) => void) | undefined;
+  variant?: ToastVariants['variant'];
+}
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts
index d4c24c83..74e0b07e 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts
@@ -1,4 +1,4 @@
-import type { ToastProps } from '.';
+import type { ToastProps } from './toast';
 
 import { computed, ref } from 'vue';
 import type { Component, VNode } from 'vue';
diff --git a/packages/icons/build.config.ts b/packages/icons/build.config.ts
index 97e572c5..c06c9309 100644
--- a/packages/icons/build.config.ts
+++ b/packages/icons/build.config.ts
@@ -4,4 +4,5 @@ export default defineBuildConfig({
   clean: true,
   declaration: true,
   entries: ['src/index'],
+  externals: ['vue'],
 });
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 0239d629..23c387ea 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -35,7 +35,6 @@
     }
   },
   "dependencies": {
-    "@vben-core/iconify": "workspace:*",
-    "vue": "^3.4.31"
+    "@vben-core/iconify": "workspace:*"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d8a354a5..112ac06f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -559,9 +559,6 @@ importers:
 
   packages/@core/forward/helpers:
     dependencies:
-      '@vben-core/toolkit':
-        specifier: workspace:*
-        version: link:../../shared/toolkit
       '@vben-core/typings':
         specifier: workspace:*
         version: link:../../shared/typings
@@ -939,9 +936,6 @@ importers:
       '@vben-core/iconify':
         specifier: workspace:*
         version: link:../@core/shared/iconify
-      vue:
-        specifier: ^3.4.31
-        version: 3.4.31(typescript@5.5.3)
 
   packages/styles:
     dependencies:
diff --git a/scripts/vsh/src/check-dep/index.ts b/scripts/vsh/src/check-dep/index.ts
index b66e89c2..3e2a4781 100644
--- a/scripts/vsh/src/check-dep/index.ts
+++ b/scripts/vsh/src/check-dep/index.ts
@@ -10,6 +10,7 @@ async function runDepcheck() {
     packages.map(async (pkg) => {
       if (
         [
+          '@vben/backend-mock',
           '@vben/commitlint-config',
           '@vben/eslint-config',
           '@vben/lint-staged-config',
@@ -40,6 +41,17 @@ async function runDepcheck() {
         ignorePatterns: ['dist', 'node_modules', 'public'],
       });
 
+      // 删除file:前缀的依赖提示，该依赖是本地依赖
+      Reflect.deleteProperty(unused.missing, 'file:');
+      Object.keys(unused.missing).forEach((key) => {
+        unused.missing[key] = unused.missing[key].filter(
+          (item: string) => !item.startsWith('/'),
+        );
+        if (unused.missing[key].length === 0) {
+          Reflect.deleteProperty(unused.missing, key);
+        }
+      });
+
       if (
         Object.keys(unused.missing).length === 0 &&
         unused.dependencies.length === 0 &&