Skip to content

Commit de50243

Browse files
authored
Correct experiment description. Remove dead experiment (#5676)
1 parent d7c993e commit de50243

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

src/deploy/functions/build.ts

+14-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as backend from "./backend";
22
import * as proto from "../../gcp/proto";
33
import * as api from "../../.../../api";
44
import * as params from "./params";
5-
import * as experiments from "../../experiments";
65
import { FirebaseError } from "../../error";
76
import { assertExhaustive, mapObject, nullsafeVisitor } from "../../functional";
87
import { UserEnvsOpts, writeUserEnvs } from "../../functions/env";
@@ -285,24 +284,22 @@ export async function resolveBackend(
285284
nonInteractive?: boolean
286285
): Promise<{ backend: backend.Backend; envs: Record<string, params.ParamValue> }> {
287286
let paramValues: Record<string, params.ParamValue> = {};
288-
if (experiments.isEnabled("functionsparams")) {
289-
paramValues = await params.resolveParams(
290-
build.params,
291-
firebaseConfig,
292-
envWithTypes(build.params, userEnvs),
293-
nonInteractive
294-
);
295-
296-
const toWrite: Record<string, string> = {};
297-
for (const paramName of Object.keys(paramValues)) {
298-
const paramValue = paramValues[paramName];
299-
if (Object.prototype.hasOwnProperty.call(userEnvs, paramName) || paramValue.internal) {
300-
continue;
301-
}
302-
toWrite[paramName] = paramValue.toString();
287+
paramValues = await params.resolveParams(
288+
build.params,
289+
firebaseConfig,
290+
envWithTypes(build.params, userEnvs),
291+
nonInteractive
292+
);
293+
294+
const toWrite: Record<string, string> = {};
295+
for (const paramName of Object.keys(paramValues)) {
296+
const paramValue = paramValues[paramName];
297+
if (Object.prototype.hasOwnProperty.call(userEnvs, paramName) || paramValue.internal) {
298+
continue;
303299
}
304-
writeUserEnvs(toWrite, userEnvOpt);
300+
toWrite[paramName] = paramValue.toString();
305301
}
302+
writeUserEnvs(toWrite, userEnvOpt);
306303

307304
return { backend: toBackend(build, paramValues), envs: paramValues };
308305
}

src/experiments.ts

+1-6
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ export const ALL_EXPERIMENTS = experiments({
6464
"of how that image was created.",
6565
public: true,
6666
},
67-
functionsparams: {
68-
shortDescription: "Adds support for paramaterizing functions deployments",
69-
default: true,
70-
},
7167

7268
// Emulator experiments
7369
emulatoruisnapshot: {
@@ -79,8 +75,7 @@ export const ALL_EXPERIMENTS = experiments({
7975
shortDescription: "Native support for popular web frameworks",
8076
fullDescription:
8177
"Adds support for popular web frameworks such as Next.js " +
82-
"Angular, React, Svelte, and Vite-compatible frameworks. Firebase is " +
83-
"committed to support these platforms long-term, but a manual migration " +
78+
"Angular, React, Svelte, and Vite-compatible frameworks. A manual migration " +
8479
"may be required when the non-experimental support for these frameworks " +
8580
"is released",
8681
docsUri: "https://firebase.google.com/docs/hosting/frameworks-overview",

0 commit comments

Comments
 (0)