@vendure/dashboard 3.3.8-master-202507220240 → 3.3.8-master-202507240240

package/src/lib/components/ui/toggle-group.tsx

@@ -0,0 +1,73 @@
+"use client"
+
+import * as React from "react"
+import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group"
+import { type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/vdb/lib/utils"
+import { toggleVariants } from "@/vdb/components/ui/toggle"
+
+const ToggleGroupContext = React.createContext<
+  VariantProps<typeof toggleVariants>
+>({
+  size: "default",
+  variant: "default",
+})
+
+function ToggleGroup({
+  className,
+  variant,
+  size,
+  children,
+  ...props
+}: React.ComponentProps<typeof ToggleGroupPrimitive.Root> &
+  VariantProps<typeof toggleVariants>) {
+  return (
+    <ToggleGroupPrimitive.Root
+      data-slot="toggle-group"
+      data-variant={variant}
+      data-size={size}
+      className={cn(
+        "group/toggle-group flex w-fit items-center rounded-md data-[variant=outline]:shadow-xs",
+        className
+      )}
+      {...props}
+    >
+      <ToggleGroupContext.Provider value={{ variant, size }}>
+        {children}
+      </ToggleGroupContext.Provider>
+    </ToggleGroupPrimitive.Root>
+  )
+}
+
+function ToggleGroupItem({
+  className,
+  children,
+  variant,
+  size,
+  ...props
+}: React.ComponentProps<typeof ToggleGroupPrimitive.Item> &
+  VariantProps<typeof toggleVariants>) {
+  const context = React.useContext(ToggleGroupContext)
+
+  return (
+    <ToggleGroupPrimitive.Item
+      data-slot="toggle-group-item"
+      data-variant={context.variant || variant}
+      data-size={context.size || size}
+      className={cn(
+        toggleVariants({
+          variant: context.variant || variant,
+          size: context.size || size,
+        }),
+        "min-w-0 flex-1 shrink-0 rounded-none shadow-none first:rounded-l-md last:rounded-r-md focus:z-10 focus-visible:z-10 data-[variant=outline]:border-l-0 data-[variant=outline]:first:border-l",
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </ToggleGroupPrimitive.Item>
+  )
+}
+
+export { ToggleGroup, ToggleGroupItem }

package/src/lib/components/ui/toggle.tsx

@@ -0,0 +1,45 @@
+import * as React from "react"
+import * as TogglePrimitive from "@radix-ui/react-toggle"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/vdb/lib/utils"
+
+const toggleVariants = cva(
+  "inline-flex items-center justify-center gap-2 rounded-md text-sm font-medium hover:bg-muted hover:text-muted-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=on]:bg-accent data-[state=on]:text-accent-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] outline-none transition-[color,box-shadow] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive whitespace-nowrap",
+  {
+    variants: {
+      variant: {
+        default: "bg-transparent",
+        outline:
+          "border border-input bg-transparent shadow-xs hover:bg-accent hover:text-accent-foreground",
+      },
+      size: {
+        default: "h-9 px-2 min-w-9",
+        sm: "h-8 px-1.5 min-w-8",
+        lg: "h-10 px-2.5 min-w-10",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+function Toggle({
+  className,
+  variant,
+  size,
+  ...props
+}: React.ComponentProps<typeof TogglePrimitive.Root> &
+  VariantProps<typeof toggleVariants>) {
+  return (
+    <TogglePrimitive.Root
+      data-slot="toggle"
+      className={cn(toggleVariants({ variant, size, className }))}
+      {...props}
+    />
+  )
+}
+
+export { Toggle, toggleVariants }

package/src/lib/index.ts

@@ -20,6 +20,7 @@ export * from './components/data-table/data-table-faceted-filter.js';
 export * from './components/data-table/data-table-filter-badge.js';
 export * from './components/data-table/data-table-filter-dialog.js';
 export * from './components/data-table/data-table-pagination.js';
+export * from './components/data-table/data-table-utils.js';
 export * from './components/data-table/data-table-view-options.js';
 export * from './components/data-table/data-table.js';
 export * from './components/data-table/filters/data-table-boolean-filter.js';
@@ -30,6 +31,8 @@ export * from './components/data-table/filters/data-table-string-filter.js';
 export * from './components/data-table/human-readable-operator.js';
 export * from './components/data-table/refresh-button.js';
 export * from './components/data-table/types.js';
+export * from './components/data-table/use-generated-columns.js';
+export * from './components/labeled-data.js';
 export * from './components/layout/app-layout.js';
 export * from './components/layout/app-sidebar.js';
 export * from './components/layout/channel-switcher.js';
@@ -101,33 +104,47 @@ export * from './components/shared/zone-selector.js';
 export * from './components/ui/accordion.js';
 export * from './components/ui/alert-dialog.js';
 export * from './components/ui/alert.js';
+export * from './components/ui/aspect-ratio.js';
 export * from './components/ui/badge.js';
 export * from './components/ui/breadcrumb.js';
 export * from './components/ui/button.js';
 export * from './components/ui/calendar.js';
 export * from './components/ui/card.js';
+export * from './components/ui/carousel.js';
+export * from './components/ui/chart.js';
 export * from './components/ui/checkbox.js';
 export * from './components/ui/collapsible.js';
 export * from './components/ui/command.js';
+export * from './components/ui/context-menu.js';
 export * from './components/ui/dialog.js';
+export * from './components/ui/drawer.js';
 export * from './components/ui/dropdown-menu.js';
 export * from './components/ui/form.js';
 export * from './components/ui/hover-card.js';
+export * from './components/ui/input-otp.js';
 export * from './components/ui/input.js';
 export * from './components/ui/label.js';
+export * from './components/ui/menubar.js';
+export * from './components/ui/navigation-menu.js';
 export * from './components/ui/pagination.js';
 export * from './components/ui/popover.js';
+export * from './components/ui/progress.js';
+export * from './components/ui/radio-group.js';
+export * from './components/ui/resizable.js';
 export * from './components/ui/scroll-area.js';
 export * from './components/ui/select.js';
 export * from './components/ui/separator.js';
 export * from './components/ui/sheet.js';
 export * from './components/ui/sidebar.js';
 export * from './components/ui/skeleton.js';
+export * from './components/ui/slider.js';
 export * from './components/ui/sonner.js';
 export * from './components/ui/switch.js';
 export * from './components/ui/table.js';
 export * from './components/ui/tabs.js';
 export * from './components/ui/textarea.js';
+export * from './components/ui/toggle-group.js';
+export * from './components/ui/toggle.js';
 export * from './components/ui/tooltip.js';
 export * from './framework/alert/alert-extensions.js';
 export * from './framework/alert/alert-item.js';
@@ -169,6 +186,7 @@ export * from './framework/extension-api/use-dashboard-extensions.js';
 export * from './framework/form-engine/custom-form-component-extensions.js';
 export * from './framework/form-engine/custom-form-component.js';
 export * from './framework/form-engine/form-schema-tools.js';
+export * from './framework/form-engine/overridden-form-component.js';
 export * from './framework/form-engine/use-generated-form.js';
 export * from './framework/form-engine/utils.js';
 export * from './framework/layout-engine/layout-extensions.js';

package/vite/utils/plugin-discovery.ts

@@ -30,6 +30,7 @@ export async function discoverPlugins({
     // Analyze source files to find local plugins and package imports
     const { localPluginLocations, packageImports } = await analyzeSourceFiles(
         vendureConfigPath,
+        pluginPackageScanner?.nodeModulesRoot ?? guessNodeModulesRoot(vendureConfigPath, logger),
         logger,
         transformTsConfigPathMappings,
     );
@@ -137,6 +138,29 @@ function getDecoratorObjectProps(decorator: any): any[] {
     return [];
 }
 
+async function isSymlinkedLocalPackage(
+    packageName: string,
+    nodeModulesRoot: string,
+): Promise<string | undefined> {
+    try {
+        const packagePath = path.join(nodeModulesRoot, packageName);
+        const stats = await fs.lstat(packagePath);
+        if (stats.isSymbolicLink()) {
+            // Get the real path that the symlink points to
+            const realPath = await fs.realpath(packagePath);
+            // If the real path is within the project directory (i.e. not in some other node_modules),
+            // then it's a local package
+            if (!realPath.includes('node_modules')) {
+                return realPath;
+            }
+        }
+    } catch (e) {
+        // Package doesn't exist or other error - not a local package
+        return undefined;
+    }
+    return undefined;
+}
+
 /**
  * Analyzes TypeScript source files starting from the config file to discover:
  * 1. Local Vendure plugins
@@ -144,6 +168,7 @@ function getDecoratorObjectProps(decorator: any): any[] {
  */
 export async function analyzeSourceFiles(
     vendureConfigPath: string,
+    nodeModulesRoot: string,
     logger: Logger,
     transformTsConfigPathMappings: TransformTsConfigPathMappingsFn,
 ): Promise<{
@@ -186,7 +211,7 @@ export async function analyzeSourceFiles(
             // Track imports to follow
             const importsToFollow: string[] = [];
 
-            function visit(node: ts.Node) {
+            async function visit(node: ts.Node) {
                 // Look for VendurePlugin decorator
                 const vendurePluginClassName = getVendurePluginClassName(node);
                 if (vendurePluginClassName) {
@@ -204,7 +229,20 @@ export async function analyzeSourceFiles(
                         // Track non-local imports (packages)
                         const npmPackageName = getNpmPackageNameFromImport(importPath);
                         if (npmPackageName) {
-                            packageImportsSet.add(npmPackageName);
+                            // Check if this is actually a symlinked local package
+                            const localPackagePath = await isSymlinkedLocalPackage(
+                                npmPackageName,
+                                nodeModulesRoot,
+                            );
+                            if (localPackagePath) {
+                                // If it is local, follow it like a local import
+                                importsToFollow.push(localPackagePath);
+                                logger.debug(
+                                    `Found symlinked local package "${npmPackageName}" at ${localPackagePath}`,
+                                );
+                            } else {
+                                packageImportsSet.add(npmPackageName);
+                            }
                         }
                         // Handle path aliases and local imports
                         const pathAliasImports = getPotentialPathAliasImportPaths(importPath, tsConfigInfo);
@@ -219,10 +257,15 @@ export async function analyzeSourceFiles(
                     }
                 }
 
-                ts.forEachChild(node, visit);
+                // Visit children
+                const promises: Array<Promise<void>> = [];
+                ts.forEachChild(node, child => {
+                    promises.push(visit(child));
+                });
+                await Promise.all(promises);
             }
 
-            visit(sourceFile);
+            await visit(sourceFile);
 
             // Follow imports
             for (const importPath of importsToFollow) {
@@ -352,19 +395,7 @@ export async function findVendurePluginFiles({
     let nodeModulesRoot = providedNodeModulesRoot;
     const readStart = Date.now();
     if (!nodeModulesRoot) {
-        // If the node_modules root path has not been explicitly
-        // specified, we will try to guess it by resolving the
-        // `@vendure/core` package.
-        try {
-            const coreUrl = import.meta.resolve('@vendure/core');
-            logger.debug(`Found core URL: ${coreUrl}`);
-            const corePath = fileURLToPath(coreUrl);
-            logger.debug(`Found core path: ${corePath}`);
-            nodeModulesRoot = path.join(path.dirname(corePath), '..', '..');
-        } catch (e) {
-            logger.warn(`Failed to resolve @vendure/core: ${e instanceof Error ? e.message : String(e)}`);
-            nodeModulesRoot = path.dirname(vendureConfigPath);
-        }
+        nodeModulesRoot = guessNodeModulesRoot(vendureConfigPath, logger);
     }
 
     const patterns = [
@@ -372,7 +403,7 @@ export async function findVendurePluginFiles({
         path.join(outputPath, '**/*.js'),
         // Node modules patterns
         ...packageGlobs.map(pattern => path.join(nodeModulesRoot, pattern)),
-    ];
+    ].map(p => p.replace(/\\/g, '/'));
 
     logger.debug(`Finding Vendure plugins using patterns: ${patterns.join('\n')}`);
 
@@ -443,3 +474,21 @@ export async function findVendurePluginFiles({
 
     return potentialPluginFiles;
 }
+
+function guessNodeModulesRoot(vendureConfigPath: string, logger: Logger): string {
+    let nodeModulesRoot: string;
+    // If the node_modules root path has not been explicitly
+    // specified, we will try to guess it by resolving the
+    // `@vendure/core` package.
+    try {
+        const coreUrl = import.meta.resolve('@vendure/core');
+        logger.debug(`Found core URL: ${coreUrl}`);
+        const corePath = fileURLToPath(coreUrl);
+        logger.debug(`Found core path: ${corePath}`);
+        nodeModulesRoot = path.join(path.dirname(corePath), '..', '..');
+    } catch (e) {
+        logger.warn(`Failed to resolve @vendure/core: ${e instanceof Error ? e.message : String(e)}`);
+        nodeModulesRoot = path.dirname(vendureConfigPath);
+    }
+    return nodeModulesRoot;
+}

package/vite/vite-plugin-tailwind-source.ts

@@ -27,10 +27,26 @@ export function dashboardTailwindSourcePlugin(): Plugin {
                 const { pluginInfo } = loadVendureConfigResult;
                 const dashboardExtensionDirs =
                     pluginInfo
-                        ?.map(
-                            ({ dashboardEntryPath, pluginPath }) =>
-                                dashboardEntryPath && path.join(pluginPath, path.dirname(dashboardEntryPath)),
-                        )
+                        ?.flatMap(({ dashboardEntryPath, sourcePluginPath, pluginPath }) => {
+                            if (!dashboardEntryPath) {
+                                return [];
+                            }
+                            const sourcePaths = [];
+                            if (sourcePluginPath) {
+                                sourcePaths.push(
+                                    path.join(
+                                        path.dirname(sourcePluginPath),
+                                        path.dirname(dashboardEntryPath),
+                                    ),
+                                );
+                            }
+                            if (pluginPath) {
+                                sourcePaths.push(
+                                    path.join(path.dirname(pluginPath), path.dirname(dashboardEntryPath)),
+                                );
+                            }
+                            return sourcePaths;
+                        })
                         .filter(x => x != null) ?? [];
                 const sources = dashboardExtensionDirs
                     .map(extension => {

package/vite/vite-plugin-vendure-dashboard.ts

@@ -76,7 +76,7 @@ export type VitePluginVendureDashboardOptions = {
      * @description
      * The path to the directory where the generated GraphQL Tada files will be output.
      */
-    gqlTadaOutputPath?: string;
+    gqlOutputPath?: string;
     tempCompilationDir?: string;
     disableTansStackRouterPlugin?: boolean;
     /**
@@ -134,8 +134,8 @@ export function vendureDashboardPlugin(options: VitePluginVendureDashboardOption
         adminApiSchemaPlugin(),
         dashboardMetadataPlugin(),
         uiConfigPlugin({ adminUiConfig: options.adminUiConfig }),
-        ...(options.gqlTadaOutputPath
-            ? [gqlTadaPlugin({ gqlTadaOutputPath: options.gqlTadaOutputPath, tempDir, packageRoot })]
+        ...(options.gqlOutputPath
+            ? [gqlTadaPlugin({ gqlTadaOutputPath: options.gqlOutputPath, tempDir, packageRoot })]
             : []),
         transformIndexHtmlPlugin(),
     ];