Skip to content

Commit 25a1e93

Browse files
committed
fix: optimize the dependency detection script prompt and fix the loop dependency problem
1 parent a765d3b commit 25a1e93

File tree

12 files changed

+56
-51
lines changed

12 files changed

+56
-51
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"build": "cross-env NODE_OPTIONS=--max-old-space-size=8192 turbo build",
2828
"build:docker": "./build-local-docker-image.sh",
2929
"changeset": "pnpm exec changeset",
30-
"check": "pnpm run check:dep && pnpm run check:circular && pnpm run check:type && pnpm run check:spell",
30+
"check": "pnpm run check:dep && pnpm run check:circular && pnpm run check:type && pnpm run check:cspell",
3131
"check:circular": "vsh check-circular",
3232
"check:dep": "vsh check-dep",
3333
"check:cspell": "cspell lint \"**/*.ts\" \"**/README.md\" \".changeset/*.md\" --no-progress",

packages/@core/forward/helpers/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
}
3737
},
3838
"dependencies": {
39-
"@vben-core/toolkit": "workspace:*",
4039
"@vben-core/typings": "workspace:*",
4140
"vue-router": "^4.4.0"
4241
}

packages/@core/locales/src/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ async function setupI18n(app: App, options: LocaleSetupOptions = {}) {
3636
}
3737

3838
export { $t, i18n, loadLocaleMessages, loadLocalesMap, setupI18n };
39+
export type { CompileError } from '@intlify/core-base';
3940
export { useI18n } from 'vue-i18n';
40-
export type { Locale } from 'vue-i18n';
4141
export type { ImportLocaleFn };
42+
export type { Locale } from 'vue-i18n';

packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toast.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
useForwardPropsEmits,
1010
} from 'radix-vue';
1111
12-
import { type ToastProps, toastVariants } from '.';
12+
import { type ToastProps, toastVariants } from './toast';
1313
1414
const props = defineProps<ToastProps>();
1515

packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/Toaster.vue

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<script setup lang="ts">
22
import { isVNode } from 'vue';
33
4-
import {
5-
Toast,
6-
ToastClose,
7-
ToastDescription,
8-
ToastProvider,
9-
ToastTitle,
10-
ToastViewport,
11-
} from '.';
4+
import Toast from './Toast.vue';
5+
import ToastClose from './ToastClose.vue';
6+
import ToastDescription from './ToastDescription.vue';
7+
import ToastProvider from './ToastProvider.vue';
8+
import ToastTitle from './ToastTitle.vue';
9+
import ToastViewport from './ToastViewport.vue';
1210
import { useToast } from './use-toast';
1311
1412
const { toasts } = useToast();
Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
import type { ToastRootProps } from 'radix-vue';
2-
3-
import type { HTMLAttributes } from 'vue';
4-
5-
import { type VariantProps, cva } from 'class-variance-authority';
6-
71
export { default as Toast } from './Toast.vue';
82
export { default as ToastAction } from './ToastAction.vue';
93
export { default as ToastClose } from './ToastClose.vue';
@@ -12,28 +6,6 @@ export { default as ToastProvider } from './ToastProvider.vue';
126
export { default as ToastTitle } from './ToastTitle.vue';
137
export { default as ToastViewport } from './ToastViewport.vue';
148
export { default as Toaster } from './Toaster.vue';
15-
export { toast, useToast } from './use-toast';
9+
export * from './toast';
1610

17-
export const toastVariants = cva(
18-
'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',
19-
{
20-
defaultVariants: {
21-
variant: 'default',
22-
},
23-
variants: {
24-
variant: {
25-
default: 'border bg-background border-border text-foreground',
26-
destructive:
27-
'destructive group border-destructive bg-destructive text-destructive-foreground',
28-
},
29-
},
30-
},
31-
);
32-
33-
type ToastVariants = VariantProps<typeof toastVariants>;
34-
35-
export interface ToastProps extends ToastRootProps {
36-
class?: HTMLAttributes['class'];
37-
onOpenChange?: ((value: boolean) => void) | undefined;
38-
variant?: ToastVariants['variant'];
39-
}
11+
export { toast, useToast } from './use-toast';
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import type { ToastRootProps } from 'radix-vue';
2+
3+
import type { HTMLAttributes } from 'vue';
4+
5+
import { type VariantProps, cva } from 'class-variance-authority';
6+
7+
export const toastVariants = cva(
8+
'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',
9+
{
10+
defaultVariants: {
11+
variant: 'default',
12+
},
13+
variants: {
14+
variant: {
15+
default: 'border bg-background border-border text-foreground',
16+
destructive:
17+
'destructive group border-destructive bg-destructive text-destructive-foreground',
18+
},
19+
},
20+
},
21+
);
22+
23+
type ToastVariants = VariantProps<typeof toastVariants>;
24+
25+
export interface ToastProps extends ToastRootProps {
26+
class?: HTMLAttributes['class'];
27+
onOpenChange?: ((value: boolean) => void) | undefined;
28+
variant?: ToastVariants['variant'];
29+
}

packages/@core/ui-kit/shadcn-ui/src/components/ui/toast/use-toast.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ToastProps } from '.';
1+
import type { ToastProps } from './toast';
22

33
import { computed, ref } from 'vue';
44
import type { Component, VNode } from 'vue';

packages/icons/build.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ export default defineBuildConfig({
44
clean: true,
55
declaration: true,
66
entries: ['src/index'],
7+
externals: ['vue'],
78
});

packages/icons/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
}
3636
},
3737
"dependencies": {
38-
"@vben-core/iconify": "workspace:*",
39-
"vue": "^3.4.31"
38+
"@vben-core/iconify": "workspace:*"
4039
}
4140
}

0 commit comments

Comments
 (0)