firebase-tools 10.6.0 → 10.7.0

package/lib/previews.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.previews = void 0;
 const lodash_1 = require("lodash");
 const configstore_1 = require("./configstore");
-exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false }, configstore_1.configstore.get("previews"));
+exports.previews = Object.assign({ rtdbrules: false, ext: false, extdev: false, extensionsemulator: false, rtdbmanagement: false, functionsv2: false, golang: false, deletegcfartifacts: false, artifactregistry: false, emulatoruisnapshot: false, frameworkawareness: false }, configstore_1.configstore.get("previews"));
 if (process.env.FIREBASE_CLI_PREVIEWS) {
     process.env.FIREBASE_CLI_PREVIEWS.split(",").forEach((feature) => {
         if ((0, lodash_1.has)(exports.previews, feature)) {

package/lib/serve/hosting.js

@@ -15,6 +15,7 @@ const stream_1 = require("stream");
 const emulatorLogger_1 = require("../emulator/emulatorLogger");
 const types_1 = require("../emulator/types");
 const utils_1 = require("../utils");
+const child_process_1 = require("child_process");
 const MAX_PORT_ATTEMPTS = 10;
 let attempts = 0;
 let destroyServer = undefined;
@@ -31,6 +32,29 @@ function startServer(options, config, port, init) {
     const morganMiddleware = morgan("combined", {
         stream: morganStream,
     });
+    const portInUse = () => {
+        const message = "Port " + options.port + " is not available.";
+        logger.log("WARN", clc.yellow("hosting: ") + message + " Trying another port...");
+        if (attempts < MAX_PORT_ATTEMPTS) {
+            attempts++;
+            startServer(options, config, port + 5, init);
+        }
+        else {
+            logger.log("WARN", message);
+            throw new error_1.FirebaseError("Could not find an open port for hosting development server.", {
+                exit: 1,
+            });
+        }
+    };
+    if (process.platform === "darwin") {
+        try {
+            (0, child_process_1.execSync)(`lsof -i :${port}`);
+            portInUse();
+            return;
+        }
+        catch (e) {
+        }
+    }
     const server = superstatic({
         debug: false,
         port: port,
@@ -60,18 +84,7 @@ function startServer(options, config, port, init) {
     destroyServer = (0, utils_1.createDestroyer)(server);
     server.on("error", (err) => {
         if (err.code === "EADDRINUSE") {
-            const message = "Port " + options.port + " is not available.";
-            logger.log("WARN", clc.yellow("hosting: ") + message + " Trying another port...");
-            if (attempts < MAX_PORT_ATTEMPTS) {
-                attempts++;
-                startServer(options, config, port + 5, init);
-            }
-            else {
-                logger.log("WARN", message);
-                throw new error_1.FirebaseError("Could not find an open port for hosting development server.", {
-                    exit: 1,
-                });
-            }
+            portInUse();
         }
         else {
             throw new error_1.FirebaseError("An error occurred while starting the hosting development server:\n\n" + err.toString(), { exit: 1 });

package/lib/serve/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.serve = void 0;
 const _ = require("lodash");
 const logger_1 = require("../logger");
+const previews_1 = require("../previews");
 const { FunctionsServer } = require("./functions");
 const TARGETS = {
     hosting: require("./hosting"),
@@ -11,6 +12,11 @@ const TARGETS = {
 async function serve(options) {
     const targetNames = options.targets;
     options.port = parseInt(options.port, 10);
+    if (previews_1.previews.frameworkawareness &&
+        targetNames.includes("hosting") &&
+        [].concat(options.config.get("hosting")).some((it) => it.source)) {
+        await require("firebase-frameworks").prepare(targetNames, { project: options.projectId }, options);
+    }
     await Promise.all(_.map(targetNames, (targetName) => {
         return TARGETS[targetName].start(options);
     }));

package/lib/track.js

@@ -1,31 +1,26 @@
 "use strict";
-var ua = require("universal-analytics");
-var _ = require("lodash");
-var { configstore } = require("./configstore");
-var pkg = require("../package.json");
-var uuid = require("uuid");
-const { logger } = require("./logger");
-var anonId = configstore.get("analytics-uuid");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.track = void 0;
+const ua = require("universal-analytics");
+const uuid_1 = require("uuid");
+const configstore_1 = require("./configstore");
+const pkg = require("../package.json");
+let anonId = configstore_1.configstore.get("analytics-uuid");
 if (!anonId) {
-    anonId = uuid.v4();
-    configstore.set("analytics-uuid", anonId);
+    anonId = (0, uuid_1.v4)();
+    configstore_1.configstore.set("analytics-uuid", anonId);
 }
-var visitor = ua(process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3", anonId, {
+const visitor = ua(process.env.FIREBASE_ANALYTICS_UA || "UA-29174744-3", anonId, {
     strictCidFormat: false,
     https: true,
 });
 visitor.set("cd1", process.platform);
 visitor.set("cd2", process.version);
 visitor.set("cd3", process.env.FIREPIT_VERSION || "none");
-function track(action, label, duration) {
-    return new Promise(function (resolve) {
-        if (!_.isString(action) || !_.isString(label)) {
-            logger.debug("track received non-string arguments:", action, label);
-            resolve();
-        }
-        duration = duration || 0;
-        if (configstore.get("tokens") && configstore.get("usage")) {
-            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(function () {
+function track(action, label, duration = 0) {
+    return new Promise((resolve) => {
+        if (configstore_1.configstore.get("tokens") && configstore_1.configstore.get("usage")) {
+            visitor.event("Firebase CLI " + pkg.version, action, label, duration).send(() => {
                 resolve();
             });
         }
@@ -34,5 +29,4 @@ function track(action, label, duration) {
         }
     });
 }
-track.track = track;
-module.exports = track;
+exports.track = track;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.6.0",
+  "version": "10.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.6.0",
+      "version": "10.7.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",
@@ -30,6 +30,7 @@
         "exit-code": "^1.0.2",
         "express": "^4.16.4",
         "filesize": "^6.1.0",
+        "firebase-frameworks": "^0.3.0",
         "fs-extra": "^5.0.0",
         "glob": "^7.1.2",
         "google-auth-library": "^7.11.0",
@@ -114,6 +115,7 @@
         "@types/tcp-port-used": "^1.0.0",
         "@types/tmp": "^0.1.0",
         "@types/triple-beam": "^1.3.0",
+        "@types/universal-analytics": "^0.4.5",
         "@types/unzipper": "^0.10.0",
         "@types/uuid": "^8.3.1",
         "@types/ws": "^7.2.3",
@@ -2477,6 +2479,12 @@
       "integrity": "sha512-tl34wMtk3q+fSdRSJ+N83f47IyXLXPPuLjHm7cmAx0fE2Wml2TZCQV3FmQdSR5J6UEGV3qafG054e0cVVFCqPA==",
       "dev": true
     },
+    "node_modules/@types/universal-analytics": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@types/universal-analytics/-/universal-analytics-0.4.5.tgz",
+      "integrity": "sha512-Opb+Un786PS3te24VtJR/QPmX00P/pXaJQtLQYJklQefP4xP0Ic3mPc2z6SDz97OrITzR+RHTBEwjtNRjZ/nLQ==",
+      "dev": true
+    },
     "node_modules/@types/unzipper": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/@types/unzipper/-/unzipper-0.10.0.tgz",
@@ -6106,6 +6114,19 @@
         "@firebase/app-types": "0.6.3"
       }
     },
+    "node_modules/firebase-frameworks": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/firebase-frameworks/-/firebase-frameworks-0.3.0.tgz",
+      "integrity": "sha512-Zxtx5WsD8ZZdItIeDjjpM+JgaIWDdwBujmLYLKf2Ou6onyRsd8bNRrnVsqrnq4S3FN9TcNYliXdwMu7AwYdW7Q==",
+      "dependencies": {
+        "tslib": "^2.3.1"
+      }
+    },
+    "node_modules/firebase-frameworks/node_modules/tslib": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+    },
     "node_modules/firebase-functions": {
       "version": "3.18.1",
       "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.18.1.tgz",
@@ -15801,6 +15822,12 @@
       "integrity": "sha512-tl34wMtk3q+fSdRSJ+N83f47IyXLXPPuLjHm7cmAx0fE2Wml2TZCQV3FmQdSR5J6UEGV3qafG054e0cVVFCqPA==",
       "dev": true
     },
+    "@types/universal-analytics": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@types/universal-analytics/-/universal-analytics-0.4.5.tgz",
+      "integrity": "sha512-Opb+Un786PS3te24VtJR/QPmX00P/pXaJQtLQYJklQefP4xP0Ic3mPc2z6SDz97OrITzR+RHTBEwjtNRjZ/nLQ==",
+      "dev": true
+    },
     "@types/unzipper": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/@types/unzipper/-/unzipper-0.10.0.tgz",
@@ -18586,6 +18613,21 @@
         }
       }
     },
+    "firebase-frameworks": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/firebase-frameworks/-/firebase-frameworks-0.3.0.tgz",
+      "integrity": "sha512-Zxtx5WsD8ZZdItIeDjjpM+JgaIWDdwBujmLYLKf2Ou6onyRsd8bNRrnVsqrnq4S3FN9TcNYliXdwMu7AwYdW7Q==",
+      "requires": {
+        "tslib": "^2.3.1"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+        }
+      }
+    },
     "firebase-functions": {
       "version": "3.18.1",
       "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.18.1.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "10.6.0",
+  "version": "10.7.0",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {
@@ -28,6 +28,7 @@
     "test:emulator": "./scripts/emulator-tests/run.sh",
     "test:extensions-deploy": "./scripts/extensions-deploy-tests/run.sh",
     "test:extensions-emulator": "./scripts/extensions-emulator-tests/run.sh",
+    "test:ext-dev-emulator": "./scripts/ext-dev-emulators-tests/run.sh",
     "test:hosting": "./scripts/hosting-tests/run.sh",
     "test:triggers-end-to-end": "./scripts/triggers-end-to-end-tests/run.sh",
     "test:storage-deploy": "./scripts/storage-deploy-tests/run.sh",
@@ -106,6 +107,7 @@
     "exit-code": "^1.0.2",
     "express": "^4.16.4",
     "filesize": "^6.1.0",
+    "firebase-frameworks": "^0.3.0",
     "fs-extra": "^5.0.0",
     "glob": "^7.1.2",
     "google-auth-library": "^7.11.0",
@@ -187,6 +189,7 @@
     "@types/tcp-port-used": "^1.0.0",
     "@types/tmp": "^0.1.0",
     "@types/triple-beam": "^1.3.0",
+    "@types/universal-analytics": "^0.4.5",
     "@types/unzipper": "^0.10.0",
     "@types/uuid": "^8.3.1",
     "@types/ws": "^7.2.3",

package/schema/firebase-config.json

@@ -330,6 +330,9 @@
                 {
                     "additionalProperties": false,
                     "properties": {
+                        "codebase": {
+                            "type": "string"
+                        },
                         "ignore": {
                             "items": {
                                 "type": "string"
@@ -381,6 +384,9 @@
                     "items": {
                         "additionalProperties": false,
                         "properties": {
+                            "codebase": {
+                                "type": "string"
+                            },
                             "ignore": {
                                 "items": {
                                     "type": "string"