From fff524b44db978d7f4a3c304331b3cdf8184e70e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 26 Sep 2022 16:49:55 +0200
Subject: [PATCH] app-backend: make "app" the default app package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fredrik Adelöw <freben@gmail.com>
Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/app-backend/api-report.md                 | 2 +-
 plugins/app-backend/src/service/appPlugin.test.ts | 3 +++
 plugins/app-backend/src/service/appPlugin.ts      | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/app-backend/api-report.md b/plugins/app-backend/api-report.md
index cfeebc6cd9..b52132ef51 100644
--- a/plugins/app-backend/api-report.md
+++ b/plugins/app-backend/api-report.md
@@ -14,7 +14,7 @@ export const appPlugin: (options: AppPluginOptions) => BackendFeature;
 
 // @alpha (undocumented)
 export type AppPluginOptions = {
-  appPackageName: string;
+  appPackageName?: string;
   staticFallbackHandler?: express.Handler;
   disableConfigInjection?: boolean;
   disableStaticFallbackCache?: boolean;
diff --git a/plugins/app-backend/src/service/appPlugin.test.ts b/plugins/app-backend/src/service/appPlugin.test.ts
index 03ed4e8845..f4a2b142e8 100644
--- a/plugins/app-backend/src/service/appPlugin.test.ts
+++ b/plugins/app-backend/src/service/appPlugin.test.ts
@@ -77,5 +77,8 @@ describe('appPlugin', () => {
         res.text(),
       ),
     ).resolves.toBe('winning');
+    await expect(
+      fetch(`http://localhost:${port}`).then(res => res.text()),
+    ).resolves.toBe('winning');
   });
 });
diff --git a/plugins/app-backend/src/service/appPlugin.ts b/plugins/app-backend/src/service/appPlugin.ts
index 185279f0f0..f88bcb14f1 100644
--- a/plugins/app-backend/src/service/appPlugin.ts
+++ b/plugins/app-backend/src/service/appPlugin.ts
@@ -33,9 +33,9 @@ export type AppPluginOptions = {
    * from. The same app package should be added as a dependency to the backend
    * package in order for it to be accessible at runtime.
    *
-   * In a typical setup with a single app package, this would be set to 'app'.
+   * In a typical setup with a single app package, this will default to 'app'.
    */
-  appPackageName: string;
+  appPackageName?: string;
 
   /**
    * A request handler to handle requests for static content that are not present in the app bundle.
@@ -96,7 +96,7 @@ export const appPlugin = createBackendPlugin({
           logger: winstonLogger,
           config,
           database: disableStaticFallbackCache ? undefined : database,
-          appPackageName,
+          appPackageName: appPackageName ?? 'app',
           staticFallbackHandler,
           disableConfigInjection,
         });