@vendure/dashboard 3.3.5-master-202506241446 → 3.3.5-master-202506250724

package/dist/plugin/tests/barrel-exports/my-plugin/index.d.ts

@@ -0,0 +1 @@
+export * from './src/my.plugin';

package/dist/plugin/tests/barrel-exports/my-plugin/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./src/my.plugin"), exports);

package/dist/plugin/tests/barrel-exports/my-plugin/src/my.plugin.d.ts

@@ -0,0 +1,2 @@
+export declare class MyPlugin {
+}

package/dist/plugin/tests/barrel-exports/my-plugin/src/my.plugin.js

@@ -0,0 +1,20 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MyPlugin = void 0;
+const core_1 = require("@vendure/core");
+let MyPlugin = class MyPlugin {
+};
+exports.MyPlugin = MyPlugin;
+exports.MyPlugin = MyPlugin = __decorate([
+    (0, core_1.VendurePlugin)({
+        imports: [core_1.PluginCommonModule],
+        providers: [],
+        dashboard: './dashboard/index.tsx',
+    })
+], MyPlugin);

package/dist/plugin/tests/barrel-exports/vendure-config.d.ts

@@ -0,0 +1,2 @@
+import { VendureConfig } from '@vendure/core';
+export declare const config: VendureConfig;

package/dist/plugin/tests/barrel-exports/vendure-config.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config = void 0;
+const my_plugin_1 = require("./my-plugin");
+exports.config = {
+    apiOptions: {
+        port: 3000,
+    },
+    authOptions: {
+        tokenMethod: 'bearer',
+    },
+    dbConnectionOptions: {
+        type: 'postgres',
+    },
+    paymentOptions: {
+        paymentMethodHandlers: [],
+    },
+    plugins: [my_plugin_1.MyPlugin],
+};

package/dist/plugin/tests/barrel-exports.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/plugin/tests/barrel-exports.spec.js

@@ -0,0 +1,14 @@
+import { join } from 'path';
+import { describe, expect, it } from 'vitest';
+import { loadVendureConfig } from '../utils/config-loader.js';
+describe('detecting plugins in barrel exports', () => {
+    it('should detect plugins in barrel exports', async () => {
+        const result = await loadVendureConfig({
+            tempDir: join(__dirname, './__temp'),
+            vendureConfigPath: join(__dirname, 'barrel-exports', 'vendure-config.ts'),
+        });
+        expect(result.pluginInfo).toHaveLength(1);
+        expect(result.pluginInfo[0].name).toBe('MyPlugin');
+        expect(result.pluginInfo[0].dashboardEntryPath).toBe('./dashboard/index.tsx');
+    });
+});

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

@@ -157,11 +157,14 @@ export async function compileFile({ inputRootDir, inputPath, outputDir, transfor
         }
     }
     async function collectImports(node) {
-        if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier)) {
+        if ((ts.isExportDeclaration(node) || ts.isImportDeclaration(node)) &&
+            node.moduleSpecifier &&
+            ts.isStringLiteral(node.moduleSpecifier)) {
             const importPath = node.moduleSpecifier.text;
             // Handle relative imports
             if (importPath.startsWith('.')) {
                 const resolvedPath = path.resolve(path.dirname(absoluteInputPath), importPath);
+                // TODO: does this handle index files correctly?
                 let resolvedTsPath = resolvedPath + '.ts';
                 // Also check for .tsx if .ts doesn't exist
                 if (!(await fs.pathExists(resolvedTsPath))) {
@@ -209,7 +212,9 @@ export async function compileFile({ inputRootDir, inputPath, outputDir, transfor
                                 continue;
                             const potentialPathBase = path.resolve(tsConfigInfo.baseUrl, patternPrefix);
                             const resolvedPath = path.join(potentialPathBase, remainingImportPath);
-                            let resolvedTsPath = resolvedPath + '.ts';
+                            let resolvedTsPath = resolvedPath.endsWith('.ts')
+                                ? resolvedPath
+                                : resolvedPath + '.ts';
                             // Similar existence checks as relative paths
                             if (!(await fs.pathExists(resolvedTsPath))) {
                                 const resolvedTsxPath = resolvedPath + '.tsx';
@@ -258,6 +263,7 @@ export async function compileFile({ inputRootDir, inputPath, outputDir, transfor
                     ts.isModuleBlock(child) ||
                     ts.isModuleDeclaration(child) ||
                     ts.isImportDeclaration(child) ||
+                    ts.isExportDeclaration(child) ||
                     child.kind === ts.SyntaxKind.SyntaxList) {
                     await collectImports(child);
                 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@vendure/dashboard",
     "private": false,
-    "version": "3.3.5-master-202506241446",
+    "version": "3.3.5-master-202506250724",
     "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-202506241446",
-        "@vendure/core": "^3.3.5-master-202506241446",
+        "@vendure/common": "^3.3.5-master-202506250724",
+        "@vendure/core": "^3.3.5-master-202506250724",
         "@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": "87c4cecdb30f3c14ca2935ab3c573ddfcaa826e9"
+    "gitHead": "7e19f372f587c6fee551324c9f826eb719b4b3b9"
 }

package/src/lib/index.ts

@@ -162,6 +162,8 @@ export * from './framework/page/use-detail-page.js';
 export * from './framework/page/use-extended-router.js';
 export * from './framework/registry/global-registry.js';
 export * from './framework/registry/registry-types.js';
+export * from './graphql/api.js';
+export * from './graphql/fragments.js';
 export * from './hooks/use-auth.js';
 export * from './hooks/use-channel.js';
 export * from './hooks/use-custom-field-config.js';

package/vite/tests/barrel-exports/my-plugin/index.ts

@@ -0,0 +1 @@
+export * from './src/my.plugin';

package/vite/tests/barrel-exports/my-plugin/src/my.plugin.ts

@@ -0,0 +1,8 @@
+import { PluginCommonModule, VendurePlugin } from '@vendure/core';
+
+@VendurePlugin({
+    imports: [PluginCommonModule],
+    providers: [],
+    dashboard: './dashboard/index.tsx',
+})
+export class MyPlugin {}

package/vite/tests/barrel-exports/package.json

@@ -0,0 +1,6 @@
+{
+    "type": "commonjs",
+    "name": "barrel-exports",
+    "version": "0.0.1", 
+    "main": "index.ts"
+}

package/vite/tests/barrel-exports/vendure-config.ts

@@ -0,0 +1,19 @@
+import { VendureConfig } from '@vendure/core';
+
+import { MyPlugin } from './my-plugin';
+
+export const config: VendureConfig = {
+    apiOptions: {
+        port: 3000,
+    },
+    authOptions: {
+        tokenMethod: 'bearer',
+    },
+    dbConnectionOptions: {
+        type: 'postgres',
+    },
+    paymentOptions: {
+        paymentMethodHandlers: [],
+    },
+    plugins: [MyPlugin],
+};

package/vite/tests/barrel-exports.spec.ts

@@ -0,0 +1,17 @@
+import { join } from 'path';
+import { describe, expect, it } from 'vitest';
+
+import { loadVendureConfig } from '../utils/config-loader.js';
+
+describe('detecting plugins in barrel exports', () => {
+    it('should detect plugins in barrel exports', async () => {
+        const result = await loadVendureConfig({
+            tempDir: join(__dirname, './__temp'),
+            vendureConfigPath: join(__dirname, 'barrel-exports', 'vendure-config.ts'),
+        });
+
+        expect(result.pluginInfo).toHaveLength(1);
+        expect(result.pluginInfo[0].name).toBe('MyPlugin');
+        expect(result.pluginInfo[0].dashboardEntryPath).toBe('./dashboard/index.tsx');
+    });
+});

package/vite/utils/config-loader.ts

@@ -328,12 +328,17 @@ export async function compileFile({
     }
 
     async function collectImports(node: ts.Node) {
-        if (ts.isImportDeclaration(node) && ts.isStringLiteral(node.moduleSpecifier)) {
+        if (
+            (ts.isExportDeclaration(node) || ts.isImportDeclaration(node)) &&
+            node.moduleSpecifier &&
+            ts.isStringLiteral(node.moduleSpecifier)
+        ) {
             const importPath = node.moduleSpecifier.text;
 
             // Handle relative imports
             if (importPath.startsWith('.')) {
                 const resolvedPath = path.resolve(path.dirname(absoluteInputPath), importPath);
+                // TODO: does this handle index files correctly?
                 let resolvedTsPath = resolvedPath + '.ts';
                 // Also check for .tsx if .ts doesn't exist
                 if (!(await fs.pathExists(resolvedTsPath))) {
@@ -384,7 +389,9 @@ export async function compileFile({
                             const potentialPathBase = path.resolve(tsConfigInfo.baseUrl, patternPrefix);
                             const resolvedPath = path.join(potentialPathBase, remainingImportPath);
 
-                            let resolvedTsPath = resolvedPath + '.ts';
+                            let resolvedTsPath = resolvedPath.endsWith('.ts')
+                                ? resolvedPath
+                                : resolvedPath + '.ts';
                             // Similar existence checks as relative paths
                             if (!(await fs.pathExists(resolvedTsPath))) {
                                 const resolvedTsxPath = resolvedPath + '.tsx';
@@ -429,6 +436,7 @@ export async function compileFile({
                     ts.isModuleBlock(child) ||
                     ts.isModuleDeclaration(child) ||
                     ts.isImportDeclaration(child) ||
+                    ts.isExportDeclaration(child) ||
                     child.kind === ts.SyntaxKind.SyntaxList
                 ) {
                     await collectImports(child);