Bump firebase-frameworks (#4539)

* Bump frameworks * schema * Adding source to array props of schema * Changelog and bump * Bump shrinkwrap * Fixing hosting schema * Revert for feedback * Formatting * Schema * Formatting * Bump to 0.4.2 which fixes a build issue for custom / express.js apps * Update CHANGELOG.md Co-authored-by: Bryan Kendall <bkend@google.com>
firebase · May 11, 2022 · 514bba3 · 514bba3
1 parent 03072fd
commit 514bba3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,2 @@
+- Updates [firebase-frameworks](https://github.com/FirebaseExtended/firebase-framework-tools) to 0.4.2 addressing several issues with the web frameworks integration.
+- Adds `hosting.source` to configuration schema as an allowed property.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "exit-code": "^1.0.2",
     "express": "^4.16.4",
     "filesize": "^6.1.0",
-    "firebase-frameworks": "^0.4.0",
+    "firebase-frameworks": "^0.4.2",
     "fs-extra": "^5.0.0",
     "glob": "^7.1.2",
     "google-auth-library": "^7.11.0",

diff --git a/schema/firebase-config.json b/schema/firebase-config.json
@@ -910,6 +910,9 @@
                         "site": {
                             "type": "string"
                         },
+                        "source": {
+                            "type": "string"
+                        },
                         "target": {
                             "type": "string"
                         },
@@ -1392,6 +1395,9 @@
                                     "site": {
                                         "type": "string"
                                     },
+                                    "source": {
+                                        "type": "string"
+                                    },
                                     "target": {
                                         "type": "string"
                                     },
@@ -1874,6 +1880,9 @@
                                     "site": {
                                         "type": "string"
                                     },
+                                    "source": {
+                                        "type": "string"
+                                    },
                                     "target": {
                                         "type": "string"
                                     },

diff --git a/src/firebaseConfig.ts b/src/firebaseConfig.ts
@@ -59,6 +59,7 @@ export type HostingHeaders = HostingSource & {
 
 type HostingBase = {
   public?: string;
+  source?: string;
   ignore?: string[];
   appAssociation?: string;
   cleanUrls?: boolean;

diff --git a/src/frameworks/index.ts b/src/frameworks/index.ts
@@ -95,8 +95,17 @@ export const prepareFrameworks = async (targetNames: string[], context: any, opt
             firebaseProjectConfig = await getAppConfig(appId, AppPlatform.WEB);
           } else {
             console.warn(
-              `No Firebase app associated with site ${site}, unable to provide authenticated server context`
+              `No Firebase app associated with site ${site}, unable to provide authenticated server context.
+You can link a Web app to a Hosting site here https://console.firebase.google.com/project/_/settings/general/web`
             );
+            if (!options.nonInteractive) {
+              const continueDeploy = await promptOnce({
+                type: "confirm",
+                default: true,
+                message: "Would you like to continue with the deploy?",
+              });
+              if (!continueDeploy) exit(1);
+            }
           }
         }
       }