firebase-tools 12.4.1 → 12.4.3

package/lib/frameworks/compose/driver/local.js

@@ -18,12 +18,21 @@ class LocalDriver {
         }
     }
     install() {
-        const [cmd, ...args] = this.spec.installCommand.split(" ");
-        this.execCmd(cmd, args);
+        if (this.spec.installCommand) {
+            if (this.spec.packageManagerInstallCommand) {
+                const [cmd, ...args] = this.spec.packageManagerInstallCommand.split(" ");
+                this.execCmd(cmd, args);
+            }
+            const [cmd, ...args] = this.spec.installCommand.split(" ");
+            this.execCmd(cmd, args);
+        }
     }
     build() {
-        const [cmd, ...args] = this.spec.buildCommand.split(" ");
-        this.execCmd(cmd, args);
+        var _a;
+        if ((_a = this.spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.build) {
+            const [cmd, ...args] = this.spec.detectedCommands.build.cmd.split(" ");
+            this.execCmd(cmd, args);
+        }
     }
     export(bundle) {
     }

package/lib/frameworks/compose/index.js

@@ -3,24 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compose = void 0;
 const driver_1 = require("./driver");
 const discover_1 = require("./discover");
-function compose(mode) {
+async function compose(mode, fs, allFrameworkSpecs) {
+    var _a, _b, _c, _d;
     let bundle = { version: "v1alpha" };
-    const spec = (0, discover_1.discover)();
+    const spec = await (0, discover_1.discover)(fs, allFrameworkSpecs);
     const driver = (0, driver_1.getDriver)(mode, spec);
-    if (spec.startCommand) {
+    if ((_a = spec.detectedCommands) === null || _a === void 0 ? void 0 : _a.run) {
         bundle.server = {
             start: {
-                cmd: spec.startCommand.split(" "),
+                cmd: spec.detectedCommands.run.cmd.split(" "),
             },
         };
     }
     driver.install();
-    if (spec.afterInstall) {
-        bundle = driver.execHook(bundle, spec.afterInstall);
+    if ((_b = spec.frameworkHooks) === null || _b === void 0 ? void 0 : _b.afterInstall) {
+        bundle = driver.execHook(bundle, spec.frameworkHooks.afterInstall);
     }
     driver.build();
-    if (spec.afterBuild) {
-        bundle = driver.execHook(bundle, spec.afterBuild);
+    if ((_c = spec.frameworkHooks) === null || _c === void 0 ? void 0 : _c.afterBuild) {
+        bundle = driver.execHook(bundle, (_d = spec.frameworkHooks) === null || _d === void 0 ? void 0 : _d.afterBuild);
     }
     if (bundle.server) {
         driver.export(bundle);

package/lib/frameworks/next/index.js

@@ -48,16 +48,25 @@ async function discover(dir) {
 exports.discover = discover;
 async function build(dir) {
     var _a, _b;
-    const { default: nextBuild } = (0, utils_1.relativeRequire)(dir, "next/dist/build");
     await (0, utils_1.warnIfCustomBuildScript)(dir, exports.name, DEFAULT_BUILD_SCRIPT);
     const reactVersion = getReactVersion(dir);
     if (reactVersion && (0, semver_1.gte)(reactVersion, "18.0.0")) {
         process.env.__NEXT_REACT_ROOT = "true";
     }
-    await nextBuild(dir, null, false, false, true).catch((e) => {
-        console.error(e.message);
-        throw e;
+    const cli = (0, utils_1.getNodeModuleBin)("next", dir);
+    const nextBuild = new Promise((resolve, reject) => {
+        var _a, _b;
+        const buildProcess = (0, cross_spawn_1.spawn)(cli, ["build"], { cwd: dir });
+        (_a = buildProcess.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => logger_1.logger.info(data.toString()));
+        (_b = buildProcess.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => logger_1.logger.info(data.toString()));
+        buildProcess.on("error", (err) => {
+            reject(new error_1.FirebaseError(`Unable to build your Next.js app: ${err}`));
+        });
+        buildProcess.on("exit", (code) => {
+            resolve(code);
+        });
     });
+    await nextBuild;
     const reasonsForBackend = new Set();
     const { distDir, trailingSlash, basePath: baseUrl } = await getConfig(dir);
     if (await (0, utils_2.isUsingMiddleware)((0, path_1.join)(dir, distDir), false)) {

package/lib/{api → gcp}/frameworks.js

@@ -3,19 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBuild = exports.createStack = exports.API_VERSION = void 0;
 const apiv2_1 = require("../apiv2");
 const api_1 = require("../api");
-exports.API_VERSION = "v1";
+exports.API_VERSION = "v2";
 const client = new apiv2_1.Client({
     urlPrefix: api_1.frameworksOrigin,
     auth: true,
     apiVersion: exports.API_VERSION,
 });
-async function createStack(projectId, location, stackId, stack) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/stacks`, stack, { queryParams: { stackId } });
+async function createStack(projectId, location, stackInput) {
+    const stackId = stackInput.name;
+    const res = await client.post(`projects/${projectId}/locations/${location}/stacks`, stackInput, { queryParams: { stackId } });
     return res.body;
 }
 exports.createStack = createStack;
-async function createBuild(projectId, location, stackId, buildId, build) {
-    const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, build, { queryParams: { buildId } });
+async function createBuild(projectId, location, stackId, buildInput) {
+    const buildId = buildInput.name;
+    const res = await client.post(`projects/${projectId}/locations/${location}/stacks/${stackId}/builds`, buildInput, { queryParams: { buildId } });
     return res.body;
 }
 exports.createBuild = createBuild;

package/lib/init/features/frameworks/index.js

@@ -1,12 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.doSetup = void 0;
+exports.createStack = exports.doSetup = void 0;
 const clc = require("colorette");
 const utils = require("../../../utils");
 const logger_1 = require("../../../logger");
 const prompt_1 = require("../../../prompt");
 const constants_1 = require("./constants");
+const repo_1 = require("./repo");
+const poller = require("../../../operation-poller");
+const api_1 = require("../../../api");
+const gcp = require("../../../gcp/frameworks");
+const frameworks_1 = require("../../../gcp/frameworks");
+const frameworksPollerOptions = {
+    apiOrigin: api_1.frameworksOrigin,
+    apiVersion: frameworks_1.API_VERSION,
+    masterTimeout: 25 * 60 * 1000,
+    maxBackoff: 10000,
+};
 async function doSetup(setup) {
+    var _a, _b;
+    const projectId = (_b = (_a = setup === null || setup === void 0 ? void 0 : setup.rcfile) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b.default;
     setup.frameworks = {};
     utils.logBullet("First we need a few details to create your service.");
     await (0, prompt_1.promptOnce)({
@@ -32,5 +45,22 @@ async function doSetup(setup) {
         message: "How do you want to deploy",
         choices: constants_1.ALLOWED_DEPLOY_METHODS,
     }, setup.frameworks);
+    if (setup.frameworks.deployMethod === "github") {
+        const cloudBuildConnRepo = await (0, repo_1.linkGitHubRepository)(projectId, setup.frameworks.region, setup.frameworks.serviceName);
+        toStack(cloudBuildConnRepo, setup.frameworks.serviceName);
+    }
 }
 exports.doSetup = doSetup;
+function toStack(cloudBuildConnRepo, stackId) {
+    return {
+        name: stackId,
+        codebase: { repository: cloudBuildConnRepo.name, rootDirectory: "/" },
+        labels: {},
+    };
+}
+async function createStack(projectId, location, stackInput) {
+    const op = await gcp.createStack(projectId, location, stackInput);
+    const stack = await poller.pollOperation(Object.assign(Object.assign({}, frameworksPollerOptions), { pollerName: `create-${projectId}-${location}-${stackInput.name}`, operationResourceName: op.name }));
+    return stack;
+}
+exports.createStack = createStack;

package/lib/init/features/{composer → frameworks}/repo.js

@@ -21,14 +21,11 @@ function extractRepoSlugFromURI(remoteUri) {
     }
     return match[1];
 }
-function generateConnectionId(stackId) {
-    return `composer-${stackId}-conn`;
-}
 function generateRepositoryId() {
     return `composer-repo`;
 }
 async function linkGitHubRepository(projectId, location, stackId) {
-    const connectionId = generateConnectionId(stackId);
+    const connectionId = stackId;
     await getOrCreateConnection(projectId, location, connectionId);
     let remoteUri = await promptRepositoryURI(projectId, location, connectionId);
     while (remoteUri === "") {

package/package.json

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

package/schema/firebase-config.json

@@ -128,6 +128,10 @@
         }
     },
     "properties": {
+        "$schema": {
+            "format": "uri",
+            "type": "string"
+        },
         "database": {
             "anyOf": [
                 {

package/lib/commands/internaltesting-frameworks-init.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = void 0;
-const command_1 = require("../command");
-const repo_1 = require("../init/features/composer/repo");
-const projectUtils_1 = require("../projectUtils");
-const requireInteractive_1 = require("../requireInteractive");
-exports.command = new command_1.Command("internaltesting:frameworks:init")
-    .description("connect github repo to cloud build")
-    .before(requireInteractive_1.default)
-    .action(async (options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    await (0, repo_1.linkGitHubRepository)(projectId, "us-central2", "stack0");
-});