@vendure/dashboard 3.3.2 → 3.3.3

package/dist/plugin/utils/config-loader.d.ts

@@ -14,6 +14,7 @@ export interface ConfigLoaderOptions {
     tempDir: string;
     vendureConfigExport?: string;
     logger?: Logger;
+    reportCompilationErrors?: boolean;
 }
 export interface LoadVendureConfigResult {
     vendureConfig: VendureConfig;
@@ -37,5 +38,15 @@ export interface LoadVendureConfigResult {
  * to handle the compiled JavaScript output.
  */
 export declare function loadVendureConfig(options: ConfigLoaderOptions): Promise<LoadVendureConfigResult>;
-export declare function compileFile(inputRootDir: string, inputPath: string, outputDir: string, logger?: Logger, compiledFiles?: Set<string>, isRoot?: boolean, pluginInfo?: PluginInfo[]): Promise<PluginInfo[]>;
+type CompileFileOptions = {
+    inputRootDir: string;
+    inputPath: string;
+    outputDir: string;
+    logger?: Logger;
+    compiledFiles?: Set<string>;
+    isRoot?: boolean;
+    pluginInfo?: PluginInfo[];
+    reportCompilationErrors?: boolean;
+};
+export declare function compileFile({ inputRootDir, inputPath, outputDir, logger, compiledFiles, isRoot, pluginInfo, reportCompilationErrors, }: CompileFileOptions): Promise<PluginInfo[]>;
 export {};

package/dist/plugin/utils/config-loader.js

@@ -38,7 +38,12 @@ export async function loadVendureConfig(options) {
     const configFileName = path.basename(vendureConfigPath);
     const inputRootDir = path.dirname(vendureConfigPath);
     await fs.remove(outputPath);
-    const pluginInfo = await compileFile(inputRootDir, vendureConfigPath, outputPath, logger);
+    const pluginInfo = await compileFile({
+        inputRootDir,
+        inputPath: vendureConfigPath,
+        outputDir: outputPath,
+        logger,
+    });
     const compiledConfigFilePath = pathToFileURL(path.join(outputPath, configFileName)).href.replace(/.ts$/, '.js');
     // create package.json with type commonjs and save it to the output dir
     await fs.writeFile(path.join(outputPath, 'package.json'), JSON.stringify({ type: 'commonjs' }, null, 2));
@@ -93,7 +98,10 @@ async function findTsConfigPaths(configPath, logger) {
                             // Normalize slashes for consistency, keep relative
                             pattern.replace(/\\/g, '/'));
                         }
-                        logger.debug(`Found tsconfig paths in ${tsConfigPath}: ${JSON.stringify({ baseUrl: tsConfigBaseUrl, paths }, null, 2)}`);
+                        logger.debug(`Found tsconfig paths in ${tsConfigPath}: ${JSON.stringify({
+                            baseUrl: tsConfigBaseUrl,
+                            paths,
+                        }, null, 2)}`);
                         return { baseUrl: tsConfigBaseUrl, paths };
                     }
                 }
@@ -111,7 +119,7 @@ async function findTsConfigPaths(configPath, logger) {
     logger.debug(`No tsconfig paths found traversing up from ${configDir}`);
     return undefined;
 }
-export async function compileFile(inputRootDir, inputPath, outputDir, logger = defaultLogger, compiledFiles = new Set(), isRoot = true, pluginInfo = []) {
+export async function compileFile({ inputRootDir, inputPath, outputDir, logger = defaultLogger, compiledFiles = new Set(), isRoot = true, pluginInfo = [], reportCompilationErrors = false, }) {
     const absoluteInputPath = path.resolve(inputPath);
     if (compiledFiles.has(absoluteInputPath)) {
         return pluginInfo;
@@ -250,7 +258,15 @@ export async function compileFile(inputRootDir, inputPath, outputDir, logger = d
     // Recursively collect all files that need to be compiled
     for (const importPath of importPaths) {
         // Pass rootTsConfigInfo down, but set isRoot to false
-        await compileFile(inputRootDir, importPath, outputDir, logger, compiledFiles, false, pluginInfo);
+        await compileFile({
+            inputRootDir,
+            inputPath: importPath,
+            outputDir,
+            logger,
+            compiledFiles,
+            isRoot: false,
+            pluginInfo,
+        });
     }
     // If this is the root file (the one that started the compilation),
     // use the TypeScript compiler API to compile all files together
@@ -289,9 +305,11 @@ export async function compileFile(inputRootDir, inputPath, outputDir, logger = d
         const program = ts.createProgram(allFiles, compilerOptions);
         logger.info(`Emitting compiled files to ${outputDir}`);
         const emitResult = program.emit();
-        const hasEmitErrors = reportDiagnostics(program, emitResult, logger);
-        if (hasEmitErrors) {
-            throw new Error('TypeScript compilation failed with errors.');
+        if (reportCompilationErrors) {
+            const hasEmitErrors = reportDiagnostics(program, emitResult, logger);
+            if (hasEmitErrors) {
+                throw new Error('TypeScript compilation failed with errors.');
+            }
         }
         logger.info(`Successfully compiled ${allFiles.length} files to ${outputDir}`);
     }

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

@@ -24,6 +24,14 @@ export type VitePluginVendureDashboardOptions = {
     gqlTadaOutputPath?: string;
     tempCompilationDir?: string;
     disableTansStackRouterPlugin?: boolean;
+    /**
+     * @description
+     * If set to `true`, compilation errors during the build process will be reported and
+     * the build will fail.
+     *
+     * @default false
+     */
+    reportCompilationErrors?: boolean;
 } & UiConfigPluginOptions & ThemeVariablesPluginOptions;
 /**
  * @description

package/dist/plugin/vite-plugin-vendure-dashboard.js

@@ -42,7 +42,11 @@ export function vendureDashboardPlugin(options) {
         }),
         themeVariablesPlugin({ theme: options.theme }),
         tailwindcss(),
-        configLoaderPlugin({ vendureConfigPath: normalizedVendureConfigPath, tempDir }),
+        configLoaderPlugin({
+            vendureConfigPath: normalizedVendureConfigPath,
+            tempDir,
+            reportCompilationErrors: options.reportCompilationErrors,
+        }),
         viteConfigPlugin({ packageRoot }),
         adminApiSchemaPlugin(),
         dashboardMetadataPlugin({ rootDir: tempDir }),

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@vendure/dashboard",
     "private": false,
-    "version": "3.3.2",
+    "version": "3.3.3",
     "type": "module",
     "repository": {
         "type": "git",
@@ -86,8 +86,8 @@
         "@types/react-dom": "^19.0.4",
         "@types/react-grid-layout": "^1.3.5",
         "@uidotdev/usehooks": "^2.4.1",
-        "@vendure/common": "3.3.2",
-        "@vendure/core": "3.3.2",
+        "@vendure/common": "3.3.3",
+        "@vendure/core": "3.3.3",
         "@vitejs/plugin-react": "^4.3.4",
         "awesome-graphql-client": "^2.1.0",
         "class-variance-authority": "^0.7.1",
@@ -130,5 +130,5 @@
         "lightningcss-linux-arm64-musl": "^1.29.3",
         "lightningcss-linux-x64-musl": "^1.29.1"
     },
-    "gitHead": "18a7e1f05da5921cc9478db90066654e502bea41"
+    "gitHead": "56068550360311cb70b04a8aba2743a1387787ac"
 }

package/src/app/routes/_authenticated/_administrators/administrators_.$id.tsx

@@ -70,9 +70,7 @@ function AdministratorDetailPage() {
         },
         params: { id: params.id },
         onSuccess: async data => {
-            toast(i18n.t('Successfully updated administrator'), {
-                position: 'top-right',
-            });
+            toast(i18n.t('Successfully updated administrator'));
             resetForm();
             if (creatingNewEntity) {
                 await navigate({ to: `../$id`, params: { id: data.id } });
@@ -80,7 +78,6 @@ function AdministratorDetailPage() {
         },
         onError: err => {
             toast(i18n.t('Failed to update administrator'), {
-                position: 'top-right',
                 description: err instanceof Error ? err.message : 'Unknown error',
             });
         },

package/src/app/routes/_authenticated/_channels/channels.tsx

@@ -8,6 +8,7 @@ import { Trans } from '@/lib/trans.js';
 import { createFileRoute, Link } from '@tanstack/react-router';
 import { PlusIcon } from 'lucide-react';
 import { channelListQuery, deleteChannelDocument } from './channels.graphql.js';
+import { useLocalFormat } from '@/hooks/use-local-format.js';
 
 export const Route = createFileRoute('/_authenticated/_channels/channels')({
     component: ChannelListPage,
@@ -15,6 +16,7 @@ export const Route = createFileRoute('/_authenticated/_channels/channels')({
 });
 
 function ChannelListPage() {
+    const { formatLanguageName } = useLocalFormat();
     return (
         <ListPage
             pageId="channel-list"
@@ -25,6 +27,10 @@ function ChannelListPage() {
             defaultVisibility={{
                 code: true,
                 token: true,
+                availableCurrencyCodes: false,
+                availableLanguageCodes: false,
+                defaultTaxZone: false,
+                defaultShippingZone: false,
             }}
             onSearchTermChange={searchTerm => {
                 return {
@@ -43,6 +49,18 @@ function ChannelListPage() {
                         );
                     },
                 },
+                seller: {
+                    header: 'Seller',
+                    cell: ({ row }) => {
+                        return row.original.seller?.name;
+                    }
+                },
+                defaultLanguageCode: {
+                    header: 'Default Language',
+                    cell: ({ row }) => {
+                        return formatLanguageName(row.original.defaultLanguageCode);
+                    }
+                },
             }}
         >
             <PageActionBarRight>

package/src/app/routes/_authenticated/_channels/channels_.$id.tsx

@@ -76,23 +76,19 @@ function ChannelDetailPage() {
         params: { id: params.id },
         onSuccess: async data => {
             if (data.__typename === 'Channel') {
-                toast(i18n.t('Successfully updated channel'), {
-                    position: 'top-right',
-                });
+                toast(i18n.t('Successfully updated channel'));
                 resetForm();
                 if (creatingNewEntity) {
                     await navigate({ to: `../$id`, params: { id: data.id } });
                 }
             } else {
                 toast(i18n.t('Failed to update channel'), {
-                    position: 'top-right',
                     description: data.message,
                 });
             }
         },
         onError: err => {
             toast(i18n.t('Failed to update channel'), {
-                position: 'top-right',
                 description: err instanceof Error ? err.message : 'Unknown error',
             });
         },

package/src/app/routes/_authenticated/_collections/collections_.$id.tsx

@@ -85,9 +85,7 @@ function CollectionDetailPage() {
         },
         params: { id: params.id },
         onSuccess: async data => {
-            toast(i18n.t('Successfully updated collection'), {
-                position: 'top-right',
-            });
+            toast(i18n.t('Successfully updated collection'));
             resetForm();
             if (creatingNewEntity) {
                 await navigate({ to: `../$id`, params: { id: data.id } });
@@ -95,7 +93,6 @@ function CollectionDetailPage() {
         },
         onError: err => {
             toast(i18n.t('Failed to update collection'), {
-                position: 'top-right',
                 description: err instanceof Error ? err.message : 'Unknown error',
             });
         },

package/src/app/routes/_authenticated/_countries/countries_.$id.tsx

@@ -57,9 +57,7 @@ function CountryDetailPage() {
         },
         params: { id: params.id },
         onSuccess: async data => {
-            toast(i18n.t('Successfully updated country'), {
-                position: 'top-right',
-            });
+            toast(i18n.t('Successfully updated country'));
             form.reset(form.getValues());
             if (creatingNewEntity) {
                 await navigate({ to: `../$id`, params: { id: data.id } });
@@ -67,7 +65,6 @@ function CountryDetailPage() {
         },
         onError: err => {
             toast(i18n.t('Failed to update country'), {
-                position: 'top-right',
                 description: err instanceof Error ? err.message : 'Unknown error',
             });
         },

package/src/app/routes/_authenticated/_facets/facets_.$id.tsx

@@ -68,9 +68,7 @@ function FacetDetailPage() {
         },
         params: { id: params.id },
         onSuccess: async data => {
-            toast(i18n.t('Successfully updated facet'), {
-                position: 'top-right',
-            });
+            toast(i18n.t('Successfully updated facet'));
             resetForm();
             if (creatingNewEntity) {
                 await navigate({ to: `../$id`, params: { id: data.id } });
@@ -78,7 +76,6 @@ function FacetDetailPage() {
         },
         onError: err => {
             toast(i18n.t('Failed to update facet'), {
-                position: 'top-right',
                 description: err instanceof Error ? err.message : 'Unknown error',
             });
         },

package/src/app/routes/_authenticated/_global-settings/global-settings.tsx

@@ -59,23 +59,19 @@ function GlobalSettingsPage() {
         params: { id: 'undefined' },
         onSuccess: async data => {
             if (data.__typename === 'GlobalSettings') {
-                toast(i18n.t('Successfully updated global settings'), {
-                    position: 'top-right',
-                });
+                toast(i18n.t('Successfully updated global settings'));
                 form.reset(form.getValues());
                 if (creatingNewEntity) {
                     await navigate({ to: `../$id`, params: { id: data.id } });
                 }
             } else {
                 toast(i18n.t('Failed to update global settings'), {
-                    position: 'top-right',
                     description: data.message,
                 });
             }
         },
         onError: err => {
             toast(i18n.t('Failed to update global settings'), {
-                position: 'top-right',
                 description: err instanceof Error ? err.message : 'Unknown error',
             });
         },

package/src/app/routes/_authenticated/_product-variants/product-variants_.$id.tsx

@@ -7,14 +7,7 @@ import { PermissionGuard } from '@/components/shared/permission-guard.js';
 import { TaxCategorySelector } from '@/components/shared/tax-category-selector.js';
 import { TranslatableFormFieldWrapper } from '@/components/shared/translatable-form-field.js';
 import { Button } from '@/components/ui/button.js';
-import {
-    FormControl,
-    FormDescription,
-    FormField,
-    FormItem,
-    FormLabel,
-    FormMessage,
-} from '@/components/ui/form.js';
+import { FormControl, FormDescription, FormItem, FormLabel, FormMessage } from '@/components/ui/form.js';
 import { Input } from '@/components/ui/input.js';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select.js';
 import { Switch } from '@/components/ui/switch.js';
@@ -194,17 +187,15 @@ function ProductVariantDetailPage() {
                                 <FormFieldWrapper
                                     control={form.control}
                                     name={`stockLevels.${index}.stockOnHand`}
+                                    label={<Trans>Stock level</Trans>}
                                     render={({ field }) => (
-                                        <FormItem>
-                                            <FormLabel>
-                                                <Trans>Stock level</Trans>
-                                            </FormLabel>
-                                            <FormControl>
-                                                <Input type="number" value={field.value} onChange={e => {
-                                                    field.onChange(e.target.valueAsNumber);
-                                                }} />
-                                            </FormControl>
-                                        </FormItem>
+                                        <Input
+                                            type="number"
+                                            value={field.value}
+                                            onChange={e => {
+                                                field.onChange(e.target.valueAsNumber);
+                                            }}
+                                        />
                                     )}
                                 />
                                 <div>
@@ -218,77 +209,68 @@ function ProductVariantDetailPage() {
                             </Fragment>
                         ))}
 
-                        <FormField
+                        <FormFieldWrapper
                             control={form.control}
                             name="trackInventory"
+                            label={<Trans>Stock levels</Trans>}
                             render={({ field }) => (
-                                <FormItem>
-                                    <FormLabel>
-                                        <Trans>Track inventory</Trans>
-                                    </FormLabel>
-                                    <Select onValueChange={val => {
+                                <Select
+                                    onValueChange={val => {
                                         if (val) {
-                                            field.onChange(val)
+                                            field.onChange(val);
                                         }
-                                    }} value={field.value}>
-                                        <FormControl>
-                                            <SelectTrigger className="">
-                                                <SelectValue placeholder="Track inventory" />
-                                            </SelectTrigger>
-                                        </FormControl>
-                                        <SelectContent>
-                                            <SelectItem value="INHERIT">
-                                                <Trans>Inherit from global settings</Trans>
-                                            </SelectItem>
-                                            <SelectItem value="TRUE">
-                                                <Trans>Track</Trans>
-                                            </SelectItem>
-                                            <SelectItem value="FALSE">
-                                                <Trans>Do not track</Trans>
-                                            </SelectItem>
-                                        </SelectContent>
-                                    </Select>
-                                </FormItem>
+                                    }}
+                                    value={field.value}
+                                >
+                                    <FormControl>
+                                        <SelectTrigger className="">
+                                            <SelectValue placeholder="Track inventory" />
+                                        </SelectTrigger>
+                                    </FormControl>
+                                    <SelectContent>
+                                        <SelectItem value="INHERIT">
+                                            <Trans>Inherit from global settings</Trans>
+                                        </SelectItem>
+                                        <SelectItem value="TRUE">
+                                            <Trans>Track</Trans>
+                                        </SelectItem>
+                                        <SelectItem value="FALSE">
+                                            <Trans>Do not track</Trans>
+                                        </SelectItem>
+                                    </SelectContent>
+                                </Select>
                             )}
                         />
-                        <FormField
+                        <FormFieldWrapper
                             control={form.control}
                             name="outOfStockThreshold"
+                            label={<Trans>Out-of-stock threshold</Trans>}
+                            description={
+                                <Trans>
+                                    Sets the stock level at which this variant is considered to be out of
+                                    stock. Using a negative value enables backorder support.
+                                </Trans>
+                            }
                             render={({ field }) => (
-                                <FormItem>
-                                    <FormLabel>
-                                        <Trans>Out-of-stock threshold</Trans>
-                                    </FormLabel>
-                                    <FormControl>
-                                        <Input type="number" {...field} />
-                                    </FormControl>
-                                    <FormDescription>
-                                        <Trans>
-                                            Sets the stock level at which this variant is considered to be out
-                                            of stock. Using a negative value enables backorder support.
-                                        </Trans>
-                                    </FormDescription>
-                                </FormItem>
+                                <Input
+                                    type="number"
+                                    value={field.value}
+                                    onChange={e => field.onChange(e.target.valueAsNumber)}
+                                />
                             )}
                         />
-                        <FormField
+                        <FormFieldWrapper
                             control={form.control}
                             name="useGlobalOutOfStockThreshold"
+                            label={<Trans>Use global out-of-stock threshold</Trans>}
+                            description={
+                                <Trans>
+                                    Sets the stock level at which this variant is considered to be out of
+                                    stock. Using a negative value enables backorder support.
+                                </Trans>
+                            }
                             render={({ field }) => (
-                                <FormItem>
-                                    <FormLabel>
-                                        <Trans>Use global out-of-stock threshold</Trans>
-                                    </FormLabel>
-                                    <FormControl>
-                                        <Switch checked={field.value} onCheckedChange={field.onChange} />
-                                    </FormControl>
-                                    <FormDescription>
-                                        <Trans>
-                                            Sets the stock level at which this variant is considered to be out
-                                            of stock. Using a negative value enables backorder support.
-                                        </Trans>
-                                    </FormDescription>
-                                </FormItem>
+                                <Switch checked={field.value} onCheckedChange={field.onChange} />
                             )}
                         />
                     </DetailFormGrid>