From 8767d0b5f981227ecfc00413554b68569e4570f3 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Tue, 18 May 2021 10:56:04 -0300
Subject: [PATCH] fix(all): .gblib has Package interface to allow export of
 services.

---
 packages/core.gbapp/services/GBDeployer.ts | 12 +++++++-----
 src/app.ts                                 |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index e03f94dc..5d74f960 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -862,12 +862,14 @@ export class GBDeployer implements IGBDeployer {
 
       // After compiled, adds the .gbapp to the current server VM context.
 
-      if (gbappPath.endsWith('.gbapp')) {
+      if (gbappPath.endsWith('.gbapp') || gbappPath.endsWith('.gblib')) {
         const m = await import(gbappPath);
-        const p = new m.Package();
-        await p.loadPackage(core, core.sequelize);
-        if (appPackages !== undefined) {
-          appPackages.push(p);
+        if (m.Package) {
+          const p = new m.Package();
+          await p.loadPackage(core, core.sequelize);
+          if (appPackages !== undefined) {
+            appPackages.push(p);
+          }
         }
       }
       GBLog.info(`.gbapp or .gblib deployed: ${gbappPath}.`);
diff --git a/src/app.ts b/src/app.ts
index c6898af5..d4bb32c3 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -150,8 +150,8 @@ export class GBServer {
           GBLog.info(`Deploying packages...`);
           GBServer.globals.sysPackages = await core.loadSysPackages(core);
           await core.checkStorage(azureDeployer);
-          await core.syncDatabaseStructure();
           await deployer.deployPackages(core, server, GBServer.globals.appPackages);
+          await core.syncDatabaseStructure();
 
           GBLog.info(`Publishing instances...`);
           const instances: IGBInstance[] = await core.loadAllInstances(