fix plugin resolution

Author: kfirstri

packages/cli/src/core/project/config.ts

@@ -84,7 +84,7 @@ class ProjectConfigReader {
     this.assertPluginProjectDoesNotLoadPlugins(project, configPath);
 
     const localResources = await this.readProjectResources(configPath, project);
-    const pluginResources = await this.readPlugins(project.plugins, root);
+    const pluginResources = await this.readPlugins(project.plugins, configPath);
 
     const entities = mergeProjectAndPluginEntities(
       localResources.entities,
@@ -193,9 +193,12 @@ class ProjectConfigReader {
 
   private async readPluginConfig(
     plugin: PluginReference,
-    hostRoot: string,
+    hostConfigPath: string,
   ): Promise<PluginConfigData> {
-    const pluginRoot = resolvePluginRoot(plugin.source, hostRoot);
+    const pluginRoot = resolvePluginRoot(
+      plugin.source,
+      dirname(hostConfigPath),
+    );
     const { configPath } = await this.findConfigOrThrow(pluginRoot);
 
     const project = await this.readConfigFile(configPath);
@@ -228,21 +231,24 @@ class ProjectConfigReader {
 
   private async readPlugins(
     plugins: PluginReference[],
-    projectRoot: string,
+    configPath: string,
   ): Promise<ProjectResources> {
     const entities: Entity[] = [];
     const functions: BackendFunction[] = [];
 
     const entityNameByPluginNamespace = new Map<string, string>();
 
     for (const plugin of plugins) {
-      const { configPath, pluginNamespace, project } =
-        await this.readPluginConfig(plugin, projectRoot);
-      this.registerPluginNamespace(pluginNamespace, configPath);
+      const {
+        configPath: pluginConfigPath,
+        pluginNamespace,
+        project,
+      } = await this.readPluginConfig(plugin, configPath);
+      this.registerPluginNamespace(pluginNamespace, pluginConfigPath);
 
       const pluginData = await this.readPluginResources(
         project,
-        configPath,
+        pluginConfigPath,
         pluginNamespace,
       );
 
@@ -253,7 +259,7 @@ class ProjectConfigReader {
         if (existingPluginNamespace) {
           throw new ConfigInvalidError(
             `Entity "${entity.name}" is defined by more than one plugin: "${existingPluginNamespace}" and "${pluginNamespace}".`,
-            configPath,
+            pluginConfigPath,
             {
               hints: [
                 {

packages/cli/tests/fixtures/plugin-duplicate-namespaces/base44/config.jsonc

@@ -2,10 +2,10 @@
   "name": "Duplicate Plugin Namespaces",
   "plugins": [
     {
-      "source": "./plugins/one"
+      "source": "../plugins/one"
     },
     {
-      "source": "./plugins/two"
+      "source": "../plugins/two"
     }
   ]
 }

packages/cli/tests/fixtures/plugin-validation-errors/duplicate-plugin-entities/base44/config.jsonc

@@ -2,10 +2,10 @@
   "name": "Duplicate Plugin Entities",
   "plugins": [
     {
-      "source": "./plugins/crm"
+      "source": "../plugins/crm"
     },
     {
-      "source": "./plugins/billing"
+      "source": "../plugins/billing"
     }
   ]
 }

packages/cli/tests/fixtures/plugin-validation-errors/entity-override/base44/config.jsonc

@@ -2,7 +2,7 @@
   "name": "Plugin Extension Override",
   "plugins": [
     {
-      "source": "./plugins/crm"
+      "source": "../plugins/crm"
     }
   ]
 }

packages/cli/tests/fixtures/plugin-validation-errors/plugin-with-plugins/base44/config.jsonc

@@ -2,7 +2,7 @@
   "name": "Plugin With Plugins",
   "plugins": [
     {
-      "source": "./plugins/a"
+      "source": "../plugins/a"
     }
   ]
 }

packages/cli/tests/fixtures/with-config-plugins/base44/config.jsonc

@@ -2,10 +2,10 @@
   "name": "Project With Config Plugins",
   "plugins": [
     {
-      "source": "./plugins/crm"
+      "source": "../plugins/crm"
     },
     {
-      "source": "./plugins/billing"
+      "source": "../plugins/billing"
     }
   ]
 }