@vendure/dashboard 3.3.5-master-202506190846 → 3.3.5-master-202506191033

package/dist/plugin/vite-plugin-config.js

@@ -22,7 +22,7 @@ export function viteConfigPlugin({ packageRoot }) {
                     ? outDirIsAbsolute
                         ? buildConfig.outDir
                         : path.resolve(process.cwd(), buildConfig.outDir)
-                    : path.resolve(process.cwd(), 'dist/vendure-dashboard');
+                    : path.resolve(process.cwd(), 'dist');
                 config.build = Object.assign(Object.assign({}, buildConfig), { outDir: normalizedOutDir });
             }
             config.resolve = {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@vendure/dashboard",
     "private": false,
-    "version": "3.3.5-master-202506190846",
+    "version": "3.3.5-master-202506191033",
     "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.5-master-202506190846",
-        "@vendure/core": "^3.3.5-master-202506190846",
+        "@vendure/common": "^3.3.5-master-202506191033",
+        "@vendure/core": "^3.3.5-master-202506191033",
         "@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": "9ad07398469f186657dcd31d0553ff0eb359215a"
+    "gitHead": "87b40d7de9d84a840e9a53fbb7fcc8e588ff4896"
 }

package/src/app/main.tsx

@@ -1,5 +1,7 @@
 import { Toaster } from '@/components/ui/sonner.js';
+import { registerDefaults } from '@/framework/defaults.js';
 import { setCustomFieldsMap } from '@/framework/document-introspection/add-custom-fields.js';
+import { executeDashboardExtensionCallbacks } from '@/framework/extension-api/define-dashboard-extension.js';
 import { useDashboardExtensions } from '@/framework/extension-api/use-dashboard-extensions.js';
 import { useExtendedRouter } from '@/framework/page/use-extended-router.js';
 import { useAuth } from '@/hooks/use-auth.js';
@@ -8,8 +10,6 @@ import { defaultLocale, dynamicActivate } from '@/providers/i18n-provider.js';
 import { createRouter, RouterProvider } from '@tanstack/react-router';
 import React, { useEffect } from 'react';
 import ReactDOM from 'react-dom/client';
-import { registerDefaults } from '@/framework/defaults.js';
-import { executeDashboardExtensionCallbacks } from '@/framework/extension-api/define-dashboard-extension.js';
 
 import { AppProviders, queryClient } from './app-providers.js';
 import { routeTree } from './routeTree.gen.js';
@@ -26,6 +26,8 @@ export const router = createRouter({
     routeTree,
     defaultPreload: 'intent',
     scrollRestoration: true,
+    // In case the dashboard gets served from a subpath, we need to set the basepath based on the environment variable
+    ...(import.meta.env.BASE_URL ? { basepath: import.meta.env.BASE_URL } : {}),
     context: {
         /* eslint-disable @typescript-eslint/no-non-null-assertion */
         auth: undefined!, // This will be set after we wrap the app in an AuthProvider

package/vite/vite-plugin-config.ts

@@ -26,7 +26,7 @@ export function viteConfigPlugin({ packageRoot }: { packageRoot: string }): Plug
                     ? outDirIsAbsolute
                         ? (buildConfig.outDir as string)
                         : path.resolve(process.cwd(), buildConfig.outDir as string)
-                    : path.resolve(process.cwd(), 'dist/vendure-dashboard');
+                    : path.resolve(process.cwd(), 'dist');
 
                 config.build = {
                     ...buildConfig,