firebase-tools 12.2.1 → 12.3.1

package/lib/frameworks/nuxt/index.js

@@ -30,7 +30,7 @@ exports.discover = discover;
 async function build(cwd) {
     await (0, utils_1.warnIfCustomBuildScript)(cwd, exports.name, DEFAULT_BUILD_SCRIPT);
     const cli = (0, utils_1.getNodeModuleBin)("nuxt", cwd);
-    const { ssr: wantsBackend, app: { baseURL }, } = await getConfig(cwd);
+    const { ssr: wantsBackend, app: { baseURL: baseUrl }, } = await getConfig(cwd);
     const command = wantsBackend ? ["build"] : ["generate"];
     const build = (0, cross_spawn_1.sync)(cli, command, {
         cwd,
@@ -43,11 +43,11 @@ async function build(cwd) {
         ? []
         : [
             {
-                source: path_1.posix.join(baseURL, "**"),
-                destination: path_1.posix.join(baseURL, "200.html"),
+                source: path_1.posix.join(baseUrl, "**"),
+                destination: path_1.posix.join(baseUrl, "200.html"),
             },
         ];
-    return { wantsBackend, rewrites };
+    return { wantsBackend, rewrites, baseUrl };
 }
 exports.build = build;
 async function ɵcodegenPublicDirectory(root, dest) {
@@ -64,12 +64,11 @@ async function ɵcodegenFunctionsDirectory(sourceDir) {
     const packageJson = JSON.parse(packageJsonBuffer.toString());
     packageJson.dependencies || (packageJson.dependencies = {});
     packageJson.dependencies["nitro-output"] = `file:${serverDir}`;
-    const { app: { baseURL: baseUrl }, } = await getConfig(sourceDir);
-    return { packageJson, frameworksEntry: "nitro", baseUrl };
+    return { packageJson, frameworksEntry: "nitro" };
 }
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 async function getDevModeHandle(cwd) {
-    const host = new Promise((resolve) => {
+    const host = new Promise((resolve, reject) => {
         const cli = (0, utils_1.getNodeModuleBin)("nuxt", cwd);
         const serve = (0, cross_spawn_1.spawn)(cli, ["dev"], { cwd: cwd });
         serve.stdout.on("data", (data) => {
@@ -81,6 +80,7 @@ async function getDevModeHandle(cwd) {
         serve.stderr.on("data", (data) => {
             process.stderr.write(data);
         });
+        serve.on("exit", reject);
     });
     return (0, utils_1.simpleProxy)(await host);
 }

package/lib/frameworks/nuxt2/index.js

@@ -60,7 +60,7 @@ async function ɵcodegenFunctionsDirectory(rootDir, destDir) {
 }
 exports.ɵcodegenFunctionsDirectory = ɵcodegenFunctionsDirectory;
 async function getDevModeHandle(cwd) {
-    const host = new Promise((resolve) => {
+    const host = new Promise((resolve, reject) => {
         const cli = (0, utils_1.getNodeModuleBin)("nuxt", cwd);
         const serve = (0, cross_spawn_1.spawn)(cli, ["dev"], { cwd });
         serve.stdout.on("data", (data) => {
@@ -72,6 +72,7 @@ async function getDevModeHandle(cwd) {
         serve.stderr.on("data", (data) => {
             process.stderr.write(data);
         });
+        serve.on("exit", reject);
     });
     return (0, utils_3.simpleProxy)(await host);
 }

package/lib/frameworks/utils.js

@@ -32,16 +32,31 @@ async function warnIfCustomBuildScript(dir, framework, defaultBuildScripts) {
     }
 }
 exports.warnIfCustomBuildScript = warnIfCustomBuildScript;
+function proxyResponse(original, next) {
+    return (response) => {
+        const { statusCode, statusMessage } = response;
+        if (!statusCode) {
+            original.end();
+            return;
+        }
+        if (statusCode === 404) {
+            return next();
+        }
+        const headers = "getHeaders" in response ? response.getHeaders() : response.headers;
+        original.writeHead(statusCode, statusMessage, headers);
+        response.pipe(original);
+    };
+}
 function simpleProxy(hostOrRequestHandler) {
     const agent = new http_1.Agent({ keepAlive: true });
+    const firebaseDefaultsJSON = process.env.__FIREBASE_DEFAULTS__;
+    const authTokenSyncURL = firebaseDefaultsJSON && JSON.parse(firebaseDefaultsJSON)._authTokenSyncURL;
     return async (originalReq, originalRes, next) => {
         const { method, headers, url: path } = originalReq;
         if (!method || !path) {
             originalRes.end();
             return;
         }
-        const firebaseDefaultsJSON = process.env.__FIREBASE_DEFAULTS__;
-        const authTokenSyncURL = firebaseDefaultsJSON && JSON.parse(firebaseDefaultsJSON)._authTokenSyncURL;
         if (path === authTokenSyncURL) {
             return next();
         }
@@ -61,8 +76,13 @@ function simpleProxy(hostOrRequestHandler) {
             };
             const req = (0, http_1.request)(opts, (response) => {
                 const { statusCode, statusMessage, headers } = response;
-                originalRes.writeHead(statusCode, statusMessage, headers);
-                response.pipe(originalRes);
+                if (statusCode === 404) {
+                    next();
+                }
+                else {
+                    originalRes.writeHead(statusCode, statusMessage, headers);
+                    response.pipe(originalRes);
+                }
             });
             originalReq.pipe(req);
             req.on("error", (err) => {
@@ -71,7 +91,9 @@ function simpleProxy(hostOrRequestHandler) {
             });
         }
         else {
-            await hostOrRequestHandler(originalReq, originalRes);
+            await Promise.resolve(hostOrRequestHandler(originalReq, originalRes, next));
+            const proxiedRes = new http_1.ServerResponse(originalReq);
+            proxyResponse(originalRes, next)(proxiedRes);
         }
     };
 }
@@ -183,25 +205,18 @@ function getFrameworksBuildTarget(purpose, validOptions) {
         }
         return frameworksBuild;
     }
-    else if (purpose === "deploy") {
-        return "production";
-    }
-    else if (process.env.NODE_ENV) {
-        switch (process.env.NODE_ENV) {
-            case "development":
-                return "development";
-            case "production":
-            case "test":
-                return "production";
-            default:
-                throw new error_1.FirebaseError(`We cannot infer your build target from a non-standard NODE_ENV. Please set the FIREBASE_FRAMEWORKS_BUILD_TARGET environment variable. Valid values are: ${validOptions.join(", ")}`);
-        }
-    }
-    else if (purpose === "test") {
+    else if (["test", "deploy"].includes(purpose)) {
         return "production";
     }
-    else {
-        return "development";
+    switch (process.env.NODE_ENV) {
+        case undefined:
+        case "development":
+            return "development";
+        case "production":
+        case "test":
+            return "production";
+        default:
+            throw new error_1.FirebaseError(`We cannot infer your build target from a non-standard NODE_ENV. Please set the FIREBASE_FRAMEWORKS_BUILD_TARGET environment variable. Valid values are: ${validOptions.join(", ")}`);
     }
 }
 exports.getFrameworksBuildTarget = getFrameworksBuildTarget;

package/lib/frameworks/vite/index.js

@@ -72,7 +72,7 @@ async function ɵcodegenPublicDirectory(root, dest) {
 }
 exports.ɵcodegenPublicDirectory = ɵcodegenPublicDirectory;
 async function getDevModeHandle(dir) {
-    const host = new Promise((resolve) => {
+    const host = new Promise((resolve, reject) => {
         const cli = (0, utils_1.getNodeModuleBin)("vite", dir);
         const serve = (0, cross_spawn_1.spawn)(cli, [], { cwd: dir });
         serve.stdout.on("data", (data) => {
@@ -84,6 +84,7 @@ async function getDevModeHandle(dir) {
         serve.stderr.on("data", (data) => {
             process.stderr.write(data);
         });
+        serve.on("exit", reject);
     });
     return (0, utils_1.simpleProxy)(await host);
 }

package/lib/functions/secrets.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.labels = exports.isFirebaseManaged = void 0;
+exports.updateEndpointSecret = exports.pruneAndDestroySecrets = exports.pruneSecrets = exports.inUse = exports.getSecretVersions = exports.of = exports.ensureSecret = exports.ensureValidKey = exports.ensureApi = exports.labels = exports.isFirebaseManaged = void 0;
 const utils = require("../utils");
 const poller = require("../operation-poller");
 const gcf = require("../gcp/cloudfunctions");
+const ensureApiEnabled = require("../ensureApiEnabled");
 const secretManager_1 = require("../gcp/secretManager");
 const error_1 = require("../error");
 const utils_1 = require("../utils");
@@ -12,6 +13,7 @@ const env_1 = require("./env");
 const logger_1 = require("../logger");
 const api_1 = require("../api");
 const functional_1 = require("../functional");
+const projectUtils_1 = require("../projectUtils");
 const FIREBASE_MANAGED = "firebase-managed";
 function isFirebaseManaged(secret) {
     return Object.keys(secret.labels || []).includes(FIREBASE_MANAGED);
@@ -27,6 +29,11 @@ function toUpperSnakeCase(key) {
         .replace(/([a-z])([A-Z])/g, "$1_$2")
         .toUpperCase();
 }
+function ensureApi(options) {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    return ensureApiEnabled.ensure(projectId, "secretmanager.googleapis.com", "runtimeconfig", true);
+}
+exports.ensureApi = ensureApi;
 async function ensureValidKey(key, options) {
     const transformedKey = toUpperSnakeCase(key);
     if (transformedKey !== key) {

package/lib/serve/index.js

@@ -19,7 +19,7 @@ async function serve(options) {
     options.port = parseInt(options.port, 10);
     if (targetNames.includes("hosting") && config.extract(options).some((it) => it.source)) {
         experiments.assertEnabled("webframeworks", "emulate a web framework");
-        await (0, frameworks_1.prepareFrameworks)(targetNames, options, options);
+        await (0, frameworks_1.prepareFrameworks)("emulate", targetNames, undefined, options);
     }
     const isDemoProject = constants_1.Constants.isDemoProject((0, projectUtils_1.getProjectId)(options) || "");
     targetNames.forEach((targetName) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "12.2.1",
+  "version": "12.3.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {

package/templates/extensions/extension.yaml

@@ -1,7 +1,9 @@
 # Learn detailed information about the fields of an extension.yaml file in the docs:
 # https://firebase.google.com/docs/extensions/reference/extension-yaml
 
-name: greet-the-world  # Identifier for your extension
+# Identifier for your extension
+# TODO: Replace this with an descriptive name for your extension.
+name: greet-the-world  
 version: 0.0.1  # Follow semver versioning
 specVersion: v1beta  # Version of the Firebase Extensions specification
 
@@ -14,12 +16,13 @@ description: >-
 
 license: Apache-2.0  # https://spdx.org/licenses/
 
-# Public URL for the source code of your extension
-sourceUrl: https://github.com/firebase/firebase-tools/tree/master/templates/extensions
+# Public URL for the source code of your extension.
+# TODO:  Replace this with your GitHub repo.
+sourceUrl: https://github.com/ORG_OR_USER/REPO_NAME
 
 # Specify whether a paid-tier billing plan is required to use your extension.
 # Learn more in the docs: https://firebase.google.com/docs/extensions/reference/extension-yaml#billing-required-field
-billingRequired: false
+billingRequired: true
 
 # In an `apis` field, list any Google APIs (like Cloud Translation, BigQuery, etc.)
 # required for your extension to operate.
@@ -39,8 +42,6 @@ resources:
     description: >-
       HTTP request-triggered function that responds with a specified greeting message
     properties:
-      # LOCATION is a user-configured parameter value specified by the user during installation.
-      location: ${LOCATION}
       # httpsTrigger is used for an HTTP triggered function.
       httpsTrigger: {}
       runtime: "nodejs16"
@@ -58,54 +59,3 @@ params:
     default: Hello
     required: true
     immutable: false
-
-  - param: LOCATION
-    label: Cloud Functions location
-    description: >-
-      Where do you want to deploy the functions created for this extension?
-      For help selecting a location, refer to the [location selection
-      guide](https://firebase.google.com/docs/functions/locations).
-    type: select
-    options:
-      - label: Iowa (us-central1)
-        value: us-central1
-      - label: South Carolina (us-east1)
-        value: us-east1
-      - label: Northern Virginia (us-east4)
-        value: us-east4
-      - label: Los Angeles (us-west2)
-        value: us-west2
-      - label: Salt Lake City (us-west3)
-        value: us-west3
-      - label: Las Vegas (us-west4)
-        value: us-west4
-      - label: Warsaw (europe-central2)
-        value: europe-central2
-      - label: Belgium (europe-west1)
-        value: europe-west1
-      - label: London (europe-west2)
-        value: europe-west2
-      - label: Frankfurt (europe-west3)
-        value: europe-west3
-      - label: Zurich (europe-west6)
-        value: europe-west6
-      - label: Hong Kong (asia-east2)
-        value: asia-east2
-      - label: Tokyo (asia-northeast1)
-        value: asia-northeast1
-      - label: Osaka (asia-northeast2)
-        value: asia-northeast2
-      - label: Seoul (asia-northeast3)
-        value: asia-northeast3
-      - label: Mumbai (asia-south1)
-        value: asia-south1
-      - label: Jakarta (asia-southeast2)
-        value: asia-southeast2
-      - label: Montreal (northamerica-northeast1)
-        value: northamerica-northeast1
-      - label: Sao Paulo (southamerica-east1)
-        value: southamerica-east1
-      - label: Sydney (australia-southeast1)
-        value: australia-southeast1
-    required: true
-    immutable: true

package/templates/extensions/javascript/index.js

@@ -5,7 +5,7 @@
  * Reference PARAMETERS in your functions code with:
  * `process.env.<parameter-name>`
  * Learn more about building extensions in the docs:
- * https://firebase.google.com/docs/extensions/alpha/overview
+ * https://firebase.google.com/docs/extensions/publishers
  */
 
 const functions = require("firebase-functions");