@meridianjs/framework 0.1.4 → 0.1.5

package/dist/index.d.ts

@@ -159,7 +159,7 @@ declare function loadLinks(container: MeridianContainer, linksDir: string): Prom
  *  - relative local path: "./src/plugins/my-plugin"
  *  - absolute path: "/absolute/path/to/plugin"
  */
-declare function loadPlugins(container: MeridianContainer, plugins: PluginConfig[], rootDir: string): Promise<void>;
+declare function loadPlugins(container: MeridianContainer, plugins: PluginConfig[], rootDir: string, server?: any): Promise<void>;
 
 declare class ConsoleLogger implements ILogger {
     private readonly prefix;

package/dist/index.js

@@ -401,7 +401,7 @@ var QueryService = class {
 };
 
 // src/plugin-loader.ts
-async function loadPlugins(container, plugins, rootDir) {
+async function loadPlugins(container, plugins, rootDir, server) {
   const logger = container.resolve("logger");
   for (const plugin of plugins) {
     logger.info(`Loading plugin: ${plugin.resolve}`);
@@ -444,17 +444,12 @@ async function loadPlugins(container, plugins, rootDir) {
       }
     }
     if (scanRoot) {
-      await autoScanPlugin(scanRoot, container, logger);
+      await autoScanPlugin(scanRoot, container, logger, server);
     }
     logger.info(`Plugin loaded: ${plugin.resolve}`);
   }
 }
-async function autoScanPlugin(scanRoot, container, logger) {
-  let server = null;
-  try {
-    server = container.resolve("server");
-  } catch {
-  }
+async function autoScanPlugin(scanRoot, container, logger, server) {
   const candidates = [
     scanRoot,
     // pluginRoot already points to compiled dir
@@ -629,7 +624,7 @@ async function bootstrap(opts) {
   const server = createServer(container, config);
   container.register({ server });
   await loadMiddlewares(server, container, path8.join(rootDir, "src", "api"));
-  await loadPlugins(container, config.plugins ?? [], rootDir);
+  await loadPlugins(container, config.plugins ?? [], rootDir, server);
   await loadLinks(container, path8.join(rootDir, "src", "links"));
   await loadRoutes(server, container, path8.join(rootDir, "src", "api"));
   await loadSubscribers(container, path8.join(rootDir, "src", "subscribers"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meridianjs/framework",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Core Meridian framework: bootstrap, DI container, module/route/subscriber/job loaders",
   "main": "./dist/index.js",
   "module": "./dist/index.js",