@vendure/dashboard 3.2.0 → 3.2.2

package/src/lib/providers/user-settings.tsx

@@ -1,89 +1,89 @@
-import React, { createContext, useState, useEffect } from 'react';
-import { Theme } from './theme-provider.js';
-
-export interface UserSettings {
-    displayLanguage: string;
-    displayLocale?: string;
-    contentLanguage: string;
-    theme: Theme;
-    displayUiExtensionPoints: boolean;
-    mainNavExpanded: boolean;
-    activeChannelId: string;
-    devMode: boolean;
-    hasSeenOnboarding: boolean;
-}
-
-const defaultSettings: UserSettings = {
-    displayLanguage: 'en',
-    displayLocale: undefined,
-    contentLanguage: 'en',
-    theme: 'system',
-    displayUiExtensionPoints: false,
-    mainNavExpanded: true,
-    activeChannelId: '',
-    devMode: false,
-    hasSeenOnboarding: false,
-};
-
-export interface UserSettingsContextType {
-    settings: UserSettings;
-    setDisplayLanguage: (language: string) => void;
-    setDisplayLocale: (locale: string | undefined) => void;
-    setContentLanguage: (language: string) => void;
-    setTheme: (theme: Theme) => void;
-    setDisplayUiExtensionPoints: (display: boolean) => void;
-    setMainNavExpanded: (expanded: boolean) => void;
-    setActiveChannelId: (channelId: string) => void;
-    setDevMode: (devMode: boolean) => void;
-    setHasSeenOnboarding: (hasSeen: boolean) => void;
-}
-
-export const UserSettingsContext = createContext<UserSettingsContextType | undefined>(undefined);
-
-const STORAGE_KEY = 'vendure-user-settings';
-
-export const UserSettingsProvider: React.FC<React.PropsWithChildren<{}>> = ({ children }) => {
-    // Load settings from localStorage or use defaults
-    const loadSettings = (): UserSettings => {
-        try {
-            const storedSettings = localStorage.getItem(STORAGE_KEY);
-            if (storedSettings) {
-                return { ...defaultSettings, ...JSON.parse(storedSettings) };
-            }
-        } catch (e) {
-            console.error('Failed to load user settings from localStorage', e);
-        }
-        return { ...defaultSettings };
-    };
-
-    const [settings, setSettings] = useState<UserSettings>(loadSettings);
-
-    // Save settings to localStorage whenever they change
-    useEffect(() => {
-        try {
-            localStorage.setItem(STORAGE_KEY, JSON.stringify(settings));
-        } catch (e) {
-            console.error('Failed to save user settings to localStorage', e);
-        }
-    }, [settings]);
-
-    // Settings updaters
-    const updateSetting = <K extends keyof UserSettings>(key: K, value: UserSettings[K]) => {
-        setSettings(prev => ({ ...prev, [key]: value }));
-    };
-
-    const contextValue: UserSettingsContextType = {
-        settings,
-        setDisplayLanguage: language => updateSetting('displayLanguage', language),
-        setDisplayLocale: locale => updateSetting('displayLocale', locale),
-        setContentLanguage: language => updateSetting('contentLanguage', language),
-        setTheme: theme => updateSetting('theme', theme),
-        setDisplayUiExtensionPoints: display => updateSetting('displayUiExtensionPoints', display),
-        setMainNavExpanded: expanded => updateSetting('mainNavExpanded', expanded),
-        setActiveChannelId: channelId => updateSetting('activeChannelId', channelId),
-        setDevMode: devMode => updateSetting('devMode', devMode),
-        setHasSeenOnboarding: hasSeen => updateSetting('hasSeenOnboarding', hasSeen),
-    };
-
-    return <UserSettingsContext.Provider value={contextValue}>{children}</UserSettingsContext.Provider>;
-};
+import React, { createContext, useState, useEffect } from 'react';
+import { Theme } from './theme-provider.js';
+
+export interface UserSettings {
+    displayLanguage: string;
+    displayLocale?: string;
+    contentLanguage: string;
+    theme: Theme;
+    displayUiExtensionPoints: boolean;
+    mainNavExpanded: boolean;
+    activeChannelId: string;
+    devMode: boolean;
+    hasSeenOnboarding: boolean;
+}
+
+const defaultSettings: UserSettings = {
+    displayLanguage: 'en',
+    displayLocale: undefined,
+    contentLanguage: 'en',
+    theme: 'system',
+    displayUiExtensionPoints: false,
+    mainNavExpanded: true,
+    activeChannelId: '',
+    devMode: false,
+    hasSeenOnboarding: false,
+};
+
+export interface UserSettingsContextType {
+    settings: UserSettings;
+    setDisplayLanguage: (language: string) => void;
+    setDisplayLocale: (locale: string | undefined) => void;
+    setContentLanguage: (language: string) => void;
+    setTheme: (theme: Theme) => void;
+    setDisplayUiExtensionPoints: (display: boolean) => void;
+    setMainNavExpanded: (expanded: boolean) => void;
+    setActiveChannelId: (channelId: string) => void;
+    setDevMode: (devMode: boolean) => void;
+    setHasSeenOnboarding: (hasSeen: boolean) => void;
+}
+
+export const UserSettingsContext = createContext<UserSettingsContextType | undefined>(undefined);
+
+const STORAGE_KEY = 'vendure-user-settings';
+
+export const UserSettingsProvider: React.FC<React.PropsWithChildren<{}>> = ({ children }) => {
+    // Load settings from localStorage or use defaults
+    const loadSettings = (): UserSettings => {
+        try {
+            const storedSettings = localStorage.getItem(STORAGE_KEY);
+            if (storedSettings) {
+                return { ...defaultSettings, ...JSON.parse(storedSettings) };
+            }
+        } catch (e) {
+            console.error('Failed to load user settings from localStorage', e);
+        }
+        return { ...defaultSettings };
+    };
+
+    const [settings, setSettings] = useState<UserSettings>(loadSettings);
+
+    // Save settings to localStorage whenever they change
+    useEffect(() => {
+        try {
+            localStorage.setItem(STORAGE_KEY, JSON.stringify(settings));
+        } catch (e) {
+            console.error('Failed to save user settings to localStorage', e);
+        }
+    }, [settings]);
+
+    // Settings updaters
+    const updateSetting = <K extends keyof UserSettings>(key: K, value: UserSettings[K]) => {
+        setSettings(prev => ({ ...prev, [key]: value }));
+    };
+
+    const contextValue: UserSettingsContextType = {
+        settings,
+        setDisplayLanguage: language => updateSetting('displayLanguage', language),
+        setDisplayLocale: locale => updateSetting('displayLocale', locale),
+        setContentLanguage: language => updateSetting('contentLanguage', language),
+        setTheme: theme => updateSetting('theme', theme),
+        setDisplayUiExtensionPoints: display => updateSetting('displayUiExtensionPoints', display),
+        setMainNavExpanded: expanded => updateSetting('mainNavExpanded', expanded),
+        setActiveChannelId: channelId => updateSetting('activeChannelId', channelId),
+        setDevMode: devMode => updateSetting('devMode', devMode),
+        setHasSeenOnboarding: hasSeen => updateSetting('hasSeenOnboarding', hasSeen),
+    };
+
+    return <UserSettingsContext.Provider value={contextValue}>{children}</UserSettingsContext.Provider>;
+};

package/src/lib/virtual.d.ts

@@ -1,12 +1,12 @@
-declare module 'virtual:admin-api-schema' {
-    import { SchemaInfo } from '../../vite/vite-plugin-admin-api-schema.js';
-    export const schemaInfo: SchemaInfo;
-}
-declare module 'virtual:dashboard-extensions' {
-    export const runDashboardExtensions: () => Promise<void>;
-}
-
-declare module 'virtual:vendure-ui-config' {
-    import { AdminUiConfig } from '@vendure/core';
-    export const uiConfig: AdminUiConfig;
-}
+declare module 'virtual:admin-api-schema' {
+    import { SchemaInfo } from '../../vite/vite-plugin-admin-api-schema.js';
+    export const schemaInfo: SchemaInfo;
+}
+declare module 'virtual:dashboard-extensions' {
+    export const runDashboardExtensions: () => Promise<void>;
+}
+
+declare module 'virtual:vendure-ui-config' {
+    import { AdminUiConfig } from '@vendure/core';
+    export const uiConfig: AdminUiConfig;
+}

package/vite/config-loader.ts

@@ -1,181 +1,181 @@
-import { Options, parse, transform } from '@swc/core';
-import { BindingIdentifier, ModuleItem, Pattern, Statement } from '@swc/types';
-import { VendureConfig } from '@vendure/core';
-import fs from 'fs-extra';
-import path from 'path';
-import { pathToFileURL } from 'url';
-
-export interface ConfigLoaderOptions {
-    vendureConfigPath: string;
-    tempDir: string;
-    vendureConfigExport?: string;
-}
-
-/**
- * @description
- * This function compiles the given Vendure config file and any imported relative files (i.e.
- * project files, not npm packages) into a temporary directory, and returns the compiled config.
- *
- * The reason we need to do this is that Vendure code makes use of TypeScript experimental decorators
- * (e.g. for NestJS decorators and TypeORM column decorators) which are not supported by esbuild.
- *
- * In Vite, when we load some TypeScript into the top-level Vite config file (in the end-user project), Vite
- * internally uses esbuild to temporarily compile that TypeScript code. Unfortunately, esbuild does not support
- * these experimental decorators, errors will be thrown as soon as e.g. a TypeORM column decorator is encountered.
- *
- * To work around this, we compile the Vendure config file and all its imports using SWC, which does support
- * these experimental decorators. The compiled files are then loaded by Vite, which is able to handle the compiled
- * JavaScript output.
- */
-export async function loadVendureConfig(
-    options: ConfigLoaderOptions,
-): Promise<{ vendureConfig: VendureConfig; exportedSymbolName: string }> {
-    const { vendureConfigPath, vendureConfigExport, tempDir } = options;
-    const outputPath = tempDir;
-    const configFileName = path.basename(vendureConfigPath);
-    const inputRootDir = path.dirname(vendureConfigPath);
-    await fs.remove(outputPath);
-    await compileFile(inputRootDir, vendureConfigPath, outputPath);
-    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));
-
-    // We need to figure out the symbol exported by the config file by
-    // analyzing the AST and finding an export with the type "VendureConfig"
-    const ast = await parse(await fs.readFile(vendureConfigPath, 'utf-8'), {
-        syntax: 'typescript',
-        decorators: true,
-    });
-    const detectedExportedSymbolName = findConfigExport(ast.body);
-    const configExportedSymbolName = detectedExportedSymbolName || vendureConfigExport;
-    if (!configExportedSymbolName) {
-        throw new Error(
-            `Could not find a variable exported as VendureConfig. Please specify the name of the exported variable using the "vendureConfigExport" option.`,
-        );
-    }
-    const config = await import(compiledConfigFilePath).then(m => m[configExportedSymbolName]);
-    if (!config) {
-        throw new Error(
-            `Could not find a variable exported as VendureConfig with the name "${configExportedSymbolName}".`,
-        );
-    }
-    return { vendureConfig: config, exportedSymbolName: configExportedSymbolName };
-}
-
-/**
- * Given the AST of a TypeScript file, finds the name of the variable exported as VendureConfig.
- */
-function findConfigExport(statements: ModuleItem[]): string | undefined {
-    for (const statement of statements) {
-        if (statement.type === 'ExportDeclaration') {
-            if (statement.declaration.type === 'VariableDeclaration') {
-                for (const declaration of statement.declaration.declarations) {
-                    if (isBindingIdentifier(declaration.id)) {
-                        const typeRef = declaration.id.typeAnnotation?.typeAnnotation;
-                        if (typeRef?.type === 'TsTypeReference') {
-                            if (
-                                typeRef.typeName.type === 'Identifier' &&
-                                typeRef.typeName.value === 'VendureConfig'
-                            ) {
-                                return declaration.id.value;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return undefined;
-}
-
-function isBindingIdentifier(id: Pattern): id is BindingIdentifier {
-    return id.type === 'Identifier' && !!(id as BindingIdentifier).typeAnnotation;
-}
-
-export async function compileFile(
-    inputRootDir: string,
-    inputPath: string,
-    outputDir: string,
-    compiledFiles = new Set<string>(),
-): Promise<void> {
-    if (compiledFiles.has(inputPath)) {
-        return;
-    }
-    compiledFiles.add(inputPath);
-
-    // Ensure output directory exists
-    await fs.ensureDir(outputDir);
-
-    // Read the source file
-    const source = await fs.readFile(inputPath, 'utf-8');
-
-    // Transform config
-    const config: Options = {
-        filename: inputPath,
-        sourceMaps: true,
-        jsc: {
-            parser: {
-                syntax: 'typescript',
-                tsx: false,
-                decorators: true,
-            },
-            target: 'es2020',
-            loose: false,
-            transform: {
-                legacyDecorator: true,
-                decoratorMetadata: true,
-            },
-        },
-        module: {
-            type: 'commonjs',
-            strict: true,
-            strictMode: true,
-            lazy: false,
-            noInterop: false,
-        },
-    };
-
-    // Transform the code using SWC
-    const result = await transform(source, config);
-
-    // Generate output file path
-    const relativePath = path.relative(inputRootDir, inputPath);
-    const outputPath = path.join(outputDir, relativePath).replace(/\.ts$/, '.js');
-
-    // Ensure the subdirectory for the output file exists
-    await fs.ensureDir(path.dirname(outputPath));
-
-    // Write the transformed code
-    await fs.writeFile(outputPath, result.code);
-
-    // Write source map if available
-    if (result.map) {
-        await fs.writeFile(`${outputPath}.map`, JSON.stringify(result.map));
-    }
-
-    // Parse the source to find relative imports
-    const ast = await parse(source, { syntax: 'typescript', decorators: true });
-    const importPaths = new Set<string>();
-
-    function collectImports(node: any) {
-        if (node.type === 'ImportDeclaration' && node.source.value.startsWith('.')) {
-            const importPath = path.resolve(path.dirname(inputPath), node.source.value);
-            importPaths.add(importPath + '.ts');
-        }
-        for (const key in node) {
-            if (node[key] && typeof node[key] === 'object') {
-                collectImports(node[key]);
-            }
-        }
-    }
-
-    collectImports(ast);
-
-    // Recursively compile all relative imports
-    for (const importPath of importPaths) {
-        await compileFile(inputRootDir, importPath, outputDir, compiledFiles);
-    }
-}
+import { Options, parse, transform } from '@swc/core';
+import { BindingIdentifier, ModuleItem, Pattern, Statement } from '@swc/types';
+import { VendureConfig } from '@vendure/core';
+import fs from 'fs-extra';
+import path from 'path';
+import { pathToFileURL } from 'url';
+
+export interface ConfigLoaderOptions {
+    vendureConfigPath: string;
+    tempDir: string;
+    vendureConfigExport?: string;
+}
+
+/**
+ * @description
+ * This function compiles the given Vendure config file and any imported relative files (i.e.
+ * project files, not npm packages) into a temporary directory, and returns the compiled config.
+ *
+ * The reason we need to do this is that Vendure code makes use of TypeScript experimental decorators
+ * (e.g. for NestJS decorators and TypeORM column decorators) which are not supported by esbuild.
+ *
+ * In Vite, when we load some TypeScript into the top-level Vite config file (in the end-user project), Vite
+ * internally uses esbuild to temporarily compile that TypeScript code. Unfortunately, esbuild does not support
+ * these experimental decorators, errors will be thrown as soon as e.g. a TypeORM column decorator is encountered.
+ *
+ * To work around this, we compile the Vendure config file and all its imports using SWC, which does support
+ * these experimental decorators. The compiled files are then loaded by Vite, which is able to handle the compiled
+ * JavaScript output.
+ */
+export async function loadVendureConfig(
+    options: ConfigLoaderOptions,
+): Promise<{ vendureConfig: VendureConfig; exportedSymbolName: string }> {
+    const { vendureConfigPath, vendureConfigExport, tempDir } = options;
+    const outputPath = tempDir;
+    const configFileName = path.basename(vendureConfigPath);
+    const inputRootDir = path.dirname(vendureConfigPath);
+    await fs.remove(outputPath);
+    await compileFile(inputRootDir, vendureConfigPath, outputPath);
+    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));
+
+    // We need to figure out the symbol exported by the config file by
+    // analyzing the AST and finding an export with the type "VendureConfig"
+    const ast = await parse(await fs.readFile(vendureConfigPath, 'utf-8'), {
+        syntax: 'typescript',
+        decorators: true,
+    });
+    const detectedExportedSymbolName = findConfigExport(ast.body);
+    const configExportedSymbolName = detectedExportedSymbolName || vendureConfigExport;
+    if (!configExportedSymbolName) {
+        throw new Error(
+            `Could not find a variable exported as VendureConfig. Please specify the name of the exported variable using the "vendureConfigExport" option.`,
+        );
+    }
+    const config = await import(compiledConfigFilePath).then(m => m[configExportedSymbolName]);
+    if (!config) {
+        throw new Error(
+            `Could not find a variable exported as VendureConfig with the name "${configExportedSymbolName}".`,
+        );
+    }
+    return { vendureConfig: config, exportedSymbolName: configExportedSymbolName };
+}
+
+/**
+ * Given the AST of a TypeScript file, finds the name of the variable exported as VendureConfig.
+ */
+function findConfigExport(statements: ModuleItem[]): string | undefined {
+    for (const statement of statements) {
+        if (statement.type === 'ExportDeclaration') {
+            if (statement.declaration.type === 'VariableDeclaration') {
+                for (const declaration of statement.declaration.declarations) {
+                    if (isBindingIdentifier(declaration.id)) {
+                        const typeRef = declaration.id.typeAnnotation?.typeAnnotation;
+                        if (typeRef?.type === 'TsTypeReference') {
+                            if (
+                                typeRef.typeName.type === 'Identifier' &&
+                                typeRef.typeName.value === 'VendureConfig'
+                            ) {
+                                return declaration.id.value;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return undefined;
+}
+
+function isBindingIdentifier(id: Pattern): id is BindingIdentifier {
+    return id.type === 'Identifier' && !!(id as BindingIdentifier).typeAnnotation;
+}
+
+export async function compileFile(
+    inputRootDir: string,
+    inputPath: string,
+    outputDir: string,
+    compiledFiles = new Set<string>(),
+): Promise<void> {
+    if (compiledFiles.has(inputPath)) {
+        return;
+    }
+    compiledFiles.add(inputPath);
+
+    // Ensure output directory exists
+    await fs.ensureDir(outputDir);
+
+    // Read the source file
+    const source = await fs.readFile(inputPath, 'utf-8');
+
+    // Transform config
+    const config: Options = {
+        filename: inputPath,
+        sourceMaps: true,
+        jsc: {
+            parser: {
+                syntax: 'typescript',
+                tsx: false,
+                decorators: true,
+            },
+            target: 'es2020',
+            loose: false,
+            transform: {
+                legacyDecorator: true,
+                decoratorMetadata: true,
+            },
+        },
+        module: {
+            type: 'commonjs',
+            strict: true,
+            strictMode: true,
+            lazy: false,
+            noInterop: false,
+        },
+    };
+
+    // Transform the code using SWC
+    const result = await transform(source, config);
+
+    // Generate output file path
+    const relativePath = path.relative(inputRootDir, inputPath);
+    const outputPath = path.join(outputDir, relativePath).replace(/\.ts$/, '.js');
+
+    // Ensure the subdirectory for the output file exists
+    await fs.ensureDir(path.dirname(outputPath));
+
+    // Write the transformed code
+    await fs.writeFile(outputPath, result.code);
+
+    // Write source map if available
+    if (result.map) {
+        await fs.writeFile(`${outputPath}.map`, JSON.stringify(result.map));
+    }
+
+    // Parse the source to find relative imports
+    const ast = await parse(source, { syntax: 'typescript', decorators: true });
+    const importPaths = new Set<string>();
+
+    function collectImports(node: any) {
+        if (node.type === 'ImportDeclaration' && node.source.value.startsWith('.')) {
+            const importPath = path.resolve(path.dirname(inputPath), node.source.value);
+            importPaths.add(importPath + '.ts');
+        }
+        for (const key in node) {
+            if (node[key] && typeof node[key] === 'object') {
+                collectImports(node[key]);
+            }
+        }
+    }
+
+    collectImports(ast);
+
+    // Recursively compile all relative imports
+    for (const importPath of importPaths) {
+        await compileFile(inputRootDir, importPath, outputDir, compiledFiles);
+    }
+}