firebase-tools 11.13.0 → 11.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/hosting-channel-deploy.js +10 -10
- package/lib/commands/hosting-channel-deploy.js.map +1 -1
- package/lib/deploy/functions/backend.js +14 -15
- package/lib/deploy/functions/backend.js.map +1 -1
- package/lib/deploy/hosting/{hostingDeploy.js → context.js} +1 -1
- package/lib/deploy/hosting/context.js.map +1 -0
- package/lib/deploy/hosting/convertConfig.js +107 -175
- package/lib/deploy/hosting/convertConfig.js.map +1 -1
- package/lib/deploy/hosting/deploy.js +5 -5
- package/lib/deploy/hosting/deploy.js.map +1 -1
- package/lib/deploy/hosting/prepare.js +13 -25
- package/lib/deploy/hosting/prepare.js.map +1 -1
- package/lib/deploy/hosting/release.js +20 -19
- package/lib/deploy/hosting/release.js.map +1 -1
- package/lib/deploy/index.js +1 -1
- package/lib/deploy/index.js.map +1 -1
- package/lib/emulator/controller.js +12 -2
- package/lib/emulator/controller.js.map +1 -1
- package/lib/emulator/downloadableEmulators.js +9 -7
- package/lib/emulator/downloadableEmulators.js.map +1 -1
- package/lib/emulator/firestoreEmulator.js +2 -2
- package/lib/emulator/firestoreEmulator.js.map +1 -1
- package/lib/emulator/functionsEmulator.js +36 -10
- package/lib/emulator/functionsEmulator.js.map +1 -1
- package/lib/emulator/functionsEmulatorRuntime.js +3 -6
- package/lib/emulator/functionsEmulatorRuntime.js.map +1 -1
- package/lib/emulator/functionsEmulatorShared.js +15 -4
- package/lib/emulator/functionsEmulatorShared.js.map +1 -1
- package/lib/experiments.js +10 -0
- package/lib/experiments.js.map +1 -1
- package/lib/frameworks/index.js +21 -6
- package/lib/frameworks/index.js.map +1 -1
- package/lib/functions/events/v2.js.map +1 -1
- package/lib/gcp/proto.js +28 -2
- package/lib/gcp/proto.js.map +1 -1
- package/lib/gcp/run.js +10 -1
- package/lib/gcp/run.js.map +1 -1
- package/lib/hosting/api.js +34 -15
- package/lib/hosting/api.js.map +1 -1
- package/lib/hosting/config.js +193 -0
- package/lib/hosting/config.js.map +1 -0
- package/lib/hosting/expireUtils.js +1 -1
- package/lib/hosting/expireUtils.js.map +1 -1
- package/lib/hosting/functionsProxy.js +12 -5
- package/lib/hosting/functionsProxy.js.map +1 -1
- package/lib/hosting/initMiddleware.js +5 -7
- package/lib/hosting/initMiddleware.js.map +1 -1
- package/lib/hosting/options.js +4 -0
- package/lib/hosting/options.js.map +1 -0
- package/lib/hosting/runTags.js +116 -0
- package/lib/hosting/runTags.js.map +1 -0
- package/lib/init/features/emulators.js +3 -0
- package/lib/init/features/emulators.js.map +1 -1
- package/lib/serve/hosting.js +11 -9
- package/lib/serve/hosting.js.map +1 -1
- package/npm-shrinkwrap.json +473 -853
- package/package.json +2 -2
- package/schema/firebase-config.json +321 -0
- package/lib/deploy/hosting/client.js +0 -10
- package/lib/deploy/hosting/client.js.map +0 -1
- package/lib/deploy/hosting/hostingDeploy.js.map +0 -1
- package/lib/deploy/hosting/validate.js +0 -42
- package/lib/deploy/hosting/validate.js.map +0 -1
- package/lib/hosting/normalizedHostingConfigs.js +0 -99
- package/lib/hosting/normalizedHostingConfigs.js.map +0 -1
package/lib/gcp/proto.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.formatServiceAccount = exports.getInvokerMembers = exports.fieldMasks = exports.renameIfPresent = exports.convertIfPresent = exports.copyIfPresent = exports.assertOneOf = exports.durationFromSeconds = exports.secondsFromDuration = void 0;
|
|
3
|
+
exports.pruneUndefiends = exports.formatServiceAccount = exports.getInvokerMembers = exports.fieldMasks = exports.renameIfPresent = exports.convertIfPresent = exports.copyIfPresent = exports.assertOneOf = exports.durationFromSeconds = exports.secondsFromDuration = void 0;
|
|
4
4
|
const error_1 = require("../error");
|
|
5
5
|
function secondsFromDuration(d) {
|
|
6
6
|
return +d.slice(0, d.length - 1);
|
|
@@ -60,7 +60,10 @@ function fieldMasks(object, ...doNotRecurseIn) {
|
|
|
60
60
|
}
|
|
61
61
|
exports.fieldMasks = fieldMasks;
|
|
62
62
|
function fieldMasksHelper(prefixes, cursor, doNotRecurseIn, masks) {
|
|
63
|
-
if (
|
|
63
|
+
if (Array.isArray(cursor) && !cursor.length) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
if (typeof cursor !== "object" || (Array.isArray(cursor) && cursor.length) || cursor === null) {
|
|
64
67
|
masks.push(prefixes.join("."));
|
|
65
68
|
return;
|
|
66
69
|
}
|
|
@@ -102,4 +105,27 @@ function formatServiceAccount(serviceAccount, projectId) {
|
|
|
102
105
|
return `serviceAccount:${serviceAccount}`;
|
|
103
106
|
}
|
|
104
107
|
exports.formatServiceAccount = formatServiceAccount;
|
|
108
|
+
function pruneUndefiends(obj) {
|
|
109
|
+
if (typeof obj !== "object" || obj === null) {
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
const keyable = obj;
|
|
113
|
+
for (const key of Object.keys(keyable)) {
|
|
114
|
+
if (keyable[key] === undefined) {
|
|
115
|
+
delete keyable[key];
|
|
116
|
+
}
|
|
117
|
+
else if (typeof keyable[key] === "object") {
|
|
118
|
+
if (Array.isArray(keyable[key])) {
|
|
119
|
+
for (const sub of keyable[key]) {
|
|
120
|
+
pruneUndefiends(sub);
|
|
121
|
+
}
|
|
122
|
+
keyable[key] = keyable[key].filter((e) => e !== undefined);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
pruneUndefiends(keyable[key]);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
exports.pruneUndefiends = pruneUndefiends;
|
|
105
131
|
//# sourceMappingURL=proto.js.map
|
package/lib/gcp/proto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proto.js","sourceRoot":"","sources":["../../src/gcp/proto.ts"],"names":[],"mappings":";;;AAAA,oCAAyC;AAUzC,SAAgB,mBAAmB,CAAC,CAAW;IAC7C,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAFD,kDAEC;AAGD,SAAgB,mBAAmB,CAAC,CAAS;IAC3C,OAAO,GAAG,CAAC,GAAG,CAAC;AACjB,CAAC;AAFD,kDAEC;AAUD,SAAgB,WAAW,CAAI,QAAgB,EAAE,GAAM,EAAE,KAAa,EAAE,GAAG,MAAmB;IAC5F,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACxB,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,IAAI,IAAI,EAAE;YACjD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;KACF;IAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,qBAAa,CACrB,WAAW,QAAQ,gBAAgB,KAAK,+CAA+C,OAAO,CAAC,IAAI,CACjG,GAAG,CACJ,EAAE,CACJ,CAAC;KACH;AACH,CAAC;AAhBD,kCAgBC;AAOD,SAAgB,aAAa,CAC3B,IAAU,EACV,GAA0C,EAC1C,GAAG,MAAY;IAEf,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE;YACrD,SAAS;SACV;QACD,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAE,CAAC;KAC3B;AACH,CAAC;AAXD,sCAWC;AAiCD,SAAgB,gBAAgB,CAO9B,GAAG,IAaE;IAEL,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACzC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;YAClD,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACjC;QACD,OAAO;KACR;IACD,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IACrD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE;QACrD,IAAI,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;KACxC;AACH,CAAC;AAjCD,4CAiCC;AAGD,SAAgB,eAAe,CAC7B,IAAoC,EACpC,GAAkC,EAClC,OAAgB,EAChB,MAAc;IAEd,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE;QACtD,OAAO;KACR;IACD,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAVD,0CAUC;AAYD,SAAgB,UAAU,CACxB,MAAS,EACT,GAAG,cAAwC;IAE3C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC;AACf,CAAC;AAPD,gCAOC;AAED,SAAS,gBAAgB,CACvB,QAAkB,EAClB,MAAe,EACf,cAAwB,EACxB,KAAe;
|
|
1
|
+
{"version":3,"file":"proto.js","sourceRoot":"","sources":["../../src/gcp/proto.ts"],"names":[],"mappings":"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"}
|
package/lib/gcp/run.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.replaceService = exports.serviceIsResolved = exports.updateService = exports.getService = exports.LOCATION_LABEL = void 0;
|
|
3
|
+
exports.setInvokerUpdate = exports.setInvokerCreate = exports.getIamPolicy = exports.setIamPolicy = exports.replaceService = exports.serviceIsResolved = exports.updateService = exports.getService = exports.gcpIds = exports.LOCATION_LABEL = void 0;
|
|
4
4
|
const apiv2_1 = require("../apiv2");
|
|
5
5
|
const error_1 = require("../error");
|
|
6
6
|
const api_1 = require("../api");
|
|
@@ -14,6 +14,15 @@ const client = new apiv2_1.Client({
|
|
|
14
14
|
apiVersion: API_VERSION,
|
|
15
15
|
});
|
|
16
16
|
exports.LOCATION_LABEL = "cloud.googleapis.com/location";
|
|
17
|
+
function gcpIds(service) {
|
|
18
|
+
var _a;
|
|
19
|
+
return {
|
|
20
|
+
serviceId: service.metadata.name,
|
|
21
|
+
projectNumber: service.metadata.namespace,
|
|
22
|
+
region: ((_a = service.metadata.labels) === null || _a === void 0 ? void 0 : _a[exports.LOCATION_LABEL]) || "unknown-region",
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
exports.gcpIds = gcpIds;
|
|
17
26
|
async function getService(name) {
|
|
18
27
|
try {
|
|
19
28
|
const response = await client.get(name);
|
package/lib/gcp/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/gcp/run.ts"],"names":[],"mappings":";;;AAAA,oCAAkC;AAClC,oCAAyC;AACzC,gCAAmC;AACnC,iCAAiC;AAEjC,sDAAiD;AACjD,sCAAmC;AAEnC,MAAM,WAAW,GAAG,IAAI,CAAC;AAEzB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC;IACxB,SAAS,EAAE,eAAS;IACpB,IAAI,EAAE,IAAI;IACV,UAAU,EAAE,WAAW;CACxB,CAAC,CAAC;AAEU,QAAA,cAAc,GAAG,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/gcp/run.ts"],"names":[],"mappings":"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"}
|
package/lib/hosting/api.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cleanAuthState = exports.getCleanDomains = exports.removeAuthDomain = exports.addAuthDomains = exports.deleteSite = exports.updateSite = exports.createSite = exports.getSite = exports.listSites = exports.createRelease = exports.cloneVersion = exports.deleteChannel = exports.updateChannelTtl = exports.createChannel = exports.listChannels = exports.getChannel = exports.normalizeName = void 0;
|
|
3
|
+
exports.cleanAuthState = exports.getCleanDomains = exports.removeAuthDomain = exports.addAuthDomains = exports.deleteSite = exports.updateSite = exports.createSite = exports.getSite = exports.listSites = exports.createRelease = exports.cloneVersion = exports.listVersions = exports.updateVersion = exports.createVersion = exports.deleteChannel = exports.updateChannelTtl = exports.createChannel = exports.listChannels = exports.getChannel = exports.normalizeName = void 0;
|
|
4
4
|
const error_1 = require("../error");
|
|
5
5
|
const api_1 = require("../api");
|
|
6
6
|
const apiv2_1 = require("../apiv2");
|
|
7
7
|
const operationPoller = require("../operation-poller");
|
|
8
8
|
const expireUtils_1 = require("../hosting/expireUtils");
|
|
9
9
|
const auth_1 = require("../gcp/auth");
|
|
10
|
+
const proto = require("../gcp/proto");
|
|
10
11
|
const ONE_WEEK_MS = 604800000;
|
|
11
12
|
var ReleaseType;
|
|
12
13
|
(function (ReleaseType) {
|
|
@@ -15,19 +16,6 @@ var ReleaseType;
|
|
|
15
16
|
ReleaseType["ROLLBACK"] = "ROLLBACK";
|
|
16
17
|
ReleaseType["SITE_DISABLE"] = "SITE_DISABLE";
|
|
17
18
|
})(ReleaseType || (ReleaseType = {}));
|
|
18
|
-
var VersionStatus;
|
|
19
|
-
(function (VersionStatus) {
|
|
20
|
-
VersionStatus["VERSION_STATUS_UNSPECIFIED"] = "VERSION_STATUS_UNSPECIFIED";
|
|
21
|
-
VersionStatus["CREATED"] = "CREATED";
|
|
22
|
-
VersionStatus["FINALIZED"] = "FINALIZED";
|
|
23
|
-
VersionStatus["DELETED"] = "DELETED";
|
|
24
|
-
VersionStatus["ABANDONED"] = "ABANDONED";
|
|
25
|
-
VersionStatus["EXPIRED"] = "EXPIRED";
|
|
26
|
-
VersionStatus["CLONING"] = "CLONING";
|
|
27
|
-
})(VersionStatus || (VersionStatus = {}));
|
|
28
|
-
var ServingConfig;
|
|
29
|
-
(function (ServingConfig) {
|
|
30
|
-
})(ServingConfig || (ServingConfig = {}));
|
|
31
19
|
function normalizeName(s) {
|
|
32
20
|
return s.replace(/[/:_#]/g, "-");
|
|
33
21
|
}
|
|
@@ -82,7 +70,7 @@ async function createChannel(project = "-", site, channelId, ttlMillis = expireU
|
|
|
82
70
|
}
|
|
83
71
|
exports.createChannel = createChannel;
|
|
84
72
|
async function updateChannelTtl(project = "-", site, channelId, ttlMillis = ONE_WEEK_MS) {
|
|
85
|
-
const res = await apiClient.patch(`/projects/${project}/sites/${site}/channels/${channelId}`, { ttl: `${ttlMillis / 1000}s` }, { queryParams: { updateMask:
|
|
73
|
+
const res = await apiClient.patch(`/projects/${project}/sites/${site}/channels/${channelId}`, { ttl: `${ttlMillis / 1000}s` }, { queryParams: { updateMask: "ttl" } });
|
|
86
74
|
return res.body;
|
|
87
75
|
}
|
|
88
76
|
exports.updateChannelTtl = updateChannelTtl;
|
|
@@ -90,6 +78,37 @@ async function deleteChannel(project = "-", site, channelId) {
|
|
|
90
78
|
await apiClient.delete(`/projects/${project}/sites/${site}/channels/${channelId}`);
|
|
91
79
|
}
|
|
92
80
|
exports.deleteChannel = deleteChannel;
|
|
81
|
+
async function createVersion(siteId, version) {
|
|
82
|
+
const res = await apiClient.post(`projects/-/sites/${siteId}/versions`, version);
|
|
83
|
+
return res.body.name;
|
|
84
|
+
}
|
|
85
|
+
exports.createVersion = createVersion;
|
|
86
|
+
async function updateVersion(site, versionId, version) {
|
|
87
|
+
const res = await apiClient.patch(`projects/-/sites/${site}/versions/${versionId}`, version, {
|
|
88
|
+
queryParams: {
|
|
89
|
+
updateMask: proto.fieldMasks(version, "labels", "config").join(","),
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
return res.body;
|
|
93
|
+
}
|
|
94
|
+
exports.updateVersion = updateVersion;
|
|
95
|
+
async function listVersions(site) {
|
|
96
|
+
let pageToken = undefined;
|
|
97
|
+
const versions = [];
|
|
98
|
+
do {
|
|
99
|
+
const queryParams = {};
|
|
100
|
+
if (pageToken) {
|
|
101
|
+
queryParams.pageToken = pageToken;
|
|
102
|
+
}
|
|
103
|
+
const res = await apiClient.get(`projects/-/sites/${site}/versions`, {
|
|
104
|
+
queryParams,
|
|
105
|
+
});
|
|
106
|
+
versions.push(...res.body.versions);
|
|
107
|
+
pageToken = res.body.nextPageToken;
|
|
108
|
+
} while (pageToken);
|
|
109
|
+
return versions;
|
|
110
|
+
}
|
|
111
|
+
exports.listVersions = listVersions;
|
|
93
112
|
async function cloneVersion(site, versionName, finalize = false) {
|
|
94
113
|
const res = await apiClient.post(`/projects/-/sites/${site}/versions:clone`, {
|
|
95
114
|
sourceVersion: versionName,
|
package/lib/hosting/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/hosting/api.ts"],"names":[],"mappings":";;;AAAA,oCAAyC;AACzC,gCAA0C;AAC1C,oCAAkC;AAClC,uDAAuD;AACvD,wDAA0D;AAC1D,sCAAgE;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/hosting/api.ts"],"names":[],"mappings":";;;AAAA,oCAAyC;AACzC,gCAA0C;AAC1C,oCAAkC;AAClC,uDAAuD;AACvD,wDAA0D;AAC1D,sCAAgE;AAChE,sCAAsC;AAEtC,MAAM,WAAW,GAAG,SAAS,CAAC;AAW9B,IAAK,WAYJ;AAZD,WAAK,WAAW;IAId,oDAAqC,CAAA;IAErC,gCAAiB,CAAA;IAEjB,oCAAqB,CAAA;IAGrB,4CAA6B,CAAA;AAC/B,CAAC,EAZI,WAAW,KAAX,WAAW,QAYf;AA0MD,SAAgB,aAAa,CAAC,CAAS;IAErC,OAAO,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAHD,sCAGC;AAED,MAAM,SAAS,GAAG,IAAI,cAAM,CAAC;IAC3B,SAAS,EAAE,sBAAgB;IAC3B,UAAU,EAAE,SAAS;IACrB,IAAI,EAAE,IAAI;CACX,CAAC,CAAC;AASI,KAAK,UAAU,UAAU,CAC9B,UAA2B,GAAG,EAC9B,IAAY,EACZ,SAAiB;IAEjB,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAC7B,aAAa,OAAO,UAAU,IAAI,aAAa,SAAS,EAAE,CAC3D,CAAC;QACF,OAAO,GAAG,CAAC,IAAI,CAAC;KACjB;IAAC,OAAO,CAAU,EAAE;QACnB,IAAI,CAAC,YAAY,qBAAa,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,EAAE;YAClD,OAAO,IAAI,CAAC;SACb;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAhBD,gCAgBC;AAOM,KAAK,UAAU,YAAY,CAChC,UAA2B,GAAG,EAC9B,IAAY;IAEZ,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,SAAS;QACP,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAC7B,aAAa,OAAO,UAAU,IAAI,WAAW,EAC7C,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAC5D,CAAC;YACF,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5B,IAAI,CAAC,EAAE;gBACL,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACrB;YACD,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,QAAQ,CAAC;aACjB;SACF;QAAC,OAAO,CAAU,EAAE;YACnB,IAAI,CAAC,YAAY,qBAAa,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,EAAE;gBAClD,MAAM,IAAI,qBAAa,CAAC,qCAAqC,IAAI,GAAG,EAAE;oBACpE,QAAQ,EAAE,CAAC;iBACZ,CAAC,CAAC;aACJ;YACD,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC;AA7BD,oCA6BC;AASM,KAAK,UAAU,aAAa,CACjC,UAA2B,GAAG,EAC9B,IAAY,EACZ,SAAiB,EACjB,YAAoB,8BAAgB;IAEpC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAC9B,aAAa,OAAO,UAAU,IAAI,uBAAuB,SAAS,EAAE,EACpE,EAAE,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,GAAG,EAAE,CAChC,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AAXD,sCAWC;AASM,KAAK,UAAU,gBAAgB,CACpC,UAA2B,GAAG,EAC9B,IAAY,EACZ,SAAiB,EACjB,YAAoB,WAAW;IAE/B,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,KAAK,CAC/B,aAAa,OAAO,UAAU,IAAI,aAAa,SAAS,EAAE,EAC1D,EAAE,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,GAAG,EAAE,EAC/B,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CACvC,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AAZD,4CAYC;AAQM,KAAK,UAAU,aAAa,CACjC,UAA2B,GAAG,EAC9B,IAAY,EACZ,SAAiB;IAEjB,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,OAAO,UAAU,IAAI,aAAa,SAAS,EAAE,CAAC,CAAC;AACrF,CAAC;AAND,sCAMC;AAKM,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,OAA6C;IAE7C,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAC9B,oBAAoB,MAAM,WAAW,EACrC,OAAO,CACR,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;AACvB,CAAC;AATD,sCASC;AAKM,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,SAAiB,EACjB,OAAyB;IAEzB,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,KAAK,CAC/B,oBAAoB,IAAI,aAAa,SAAS,EAAE,EAChD,OAAO,EACP;QACE,WAAW,EAAE;YAOX,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;SACpE;KACF,CACF,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AArBD,sCAqBC;AAUM,KAAK,UAAU,YAAY,CAAC,IAAY;IAC7C,IAAI,SAAS,GAAuB,SAAS,CAAC;IAC9C,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,GAAG;QACD,MAAM,WAAW,GAA2B,EAAE,CAAC;QAC/C,IAAI,SAAS,EAAE;YACb,WAAW,CAAC,SAAS,GAAG,SAAS,CAAC;SACnC;QACD,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAAuB,oBAAoB,IAAI,WAAW,EAAE;YACzF,WAAW;SACZ,CAAC,CAAC;QACH,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpC,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC;KACpC,QAAQ,SAAS,EAAE;IACpB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAfD,oCAeC;AAQM,KAAK,UAAU,YAAY,CAChC,IAAY,EACZ,WAAmB,EACnB,QAAQ,GAAG,KAAK;IAEhB,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAC9B,qBAAqB,IAAI,iBAAiB,EAC1C;QACE,aAAa,EAAE,WAAW;QAC1B,QAAQ;KACT,CACF,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,aAAa,CAAU;QAC3D,SAAS,EAAE,sBAAgB;QAC3B,UAAU,EAAE,SAAS;QACrB,qBAAqB,EAAE,aAAa;QACpC,aAAa,EAAE,MAAM;KACtB,CAAC,CAAC;IACH,OAAO,OAAO,CAAC;AACjB,CAAC;AApBD,oCAoBC;AAQM,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,OAAe,EACf,OAAe;IAEf,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,OAAO,CAAgB;QACjD,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,qBAAqB,IAAI,aAAa,OAAO,WAAW;QAC9D,WAAW,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE;KACtC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AAXD,sCAWC;AAOM,KAAK,UAAU,SAAS,CAAC,OAAe;IAC7C,MAAM,KAAK,GAAW,EAAE,CAAC;IACzB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,SAAS;QACP,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAC7B,aAAa,OAAO,QAAQ,EAC5B,EAAE,WAAW,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAC5D,CAAC;YACF,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;YACzB,IAAI,CAAC,EAAE;gBACL,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aAClB;YACD,aAAa,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,KAAK,CAAC;aACd;SACF;QAAC,OAAO,CAAU,EAAE;YACnB,IAAI,CAAC,YAAY,qBAAa,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,EAAE;gBAClD,MAAM,IAAI,qBAAa,CAAC,qCAAqC,OAAO,GAAG,EAAE;oBACvE,QAAQ,EAAE,CAAC;iBACZ,CAAC,CAAC;aACJ;YACD,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC;AA1BD,8BA0BC;AAQM,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,IAAY;IACzD,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,GAAG,CAAO,aAAa,OAAO,UAAU,IAAI,EAAE,CAAC,CAAC;QAC5E,OAAO,GAAG,CAAC,IAAI,CAAC;KACjB;IAAC,OAAO,CAAU,EAAE;QACnB,IAAI,CAAC,YAAY,qBAAa,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,EAAE;YAClD,MAAM,IAAI,qBAAa,CAAC,wBAAwB,IAAI,kBAAkB,OAAO,GAAG,EAAE;gBAChF,QAAQ,EAAE,CAAC;aACZ,CAAC,CAAC;SACJ;QACD,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAZD,0BAYC;AASM,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,IAAY,EAAE,KAAK,GAAG,EAAE;IACxE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAC9B,aAAa,OAAO,QAAQ,EAC5B,EAAE,KAAK,EAAE,KAAK,EAAE,EAChB,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAClC,CAAC;IACF,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AAPD,gCAOC;AASM,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,IAAU,EAAE,MAAgB;IAC5E,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,KAAK,CAAa,aAAa,OAAO,UAAU,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE;QAC7F,WAAW,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;KAC9C,CAAC,CAAC;IACH,OAAO,GAAG,CAAC,IAAI,CAAC;AAClB,CAAC;AALD,gCAKC;AAQM,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,IAAY;IAC5D,MAAM,SAAS,CAAC,MAAM,CAAO,aAAa,OAAO,UAAU,IAAI,EAAE,CAAC,CAAC;AACrE,CAAC;AAFD,gCAEC;AAOM,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,IAAc;IAClE,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,OAAO,IAAI,EAAE,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAChC,SAAS;SACV;QACD,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC1B;IACD,OAAO,MAAM,IAAA,wBAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACvD,CAAC;AAXD,wCAWC;AAOM,KAAK,UAAU,gBAAgB,CAAC,OAAe,EAAE,GAAW;IACjE,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,OAAO,OAAO,CAAC;KAChB;IACD,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,KAAK,YAAY,CAAC,CAAC;IAChF,OAAO,IAAA,wBAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AARD,4CAQC;AAUM,KAAK,UAAU,eAAe,CAAC,OAAe,EAAE,IAAY;IACjE,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEnD,MAAM,UAAU,GAAG,QAAQ;SACxB,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;SAC9D,MAAM,CAAC,CAAC,GAA+B,EAAE,OAAe,EAAE,EAAE;QAC3D,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QACpB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAGT,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;IAE/C,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;QAGjC,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,mBAAmB,EAAE;YACvB,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACzB,OAAO;SACR;QAED,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC1E,IAAI,mBAAmB,EAAE;YACvB,OAAO;SACR;QAED,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IACH,OAAO,WAAW,CAAC;AACrB,CAAC;AAlCD,0CAkCC;AASM,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,KAAe;IAEf,MAAM,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;IAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACzD,MAAM,cAAc,GAAG,MAAM,IAAA,wBAAiB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACrE,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KACzC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAXD,wCAWC"}
|
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.hostingConfig = exports.normalize = exports.resolveTargets = exports.validate = exports.extract = exports.filterExcept = exports.filterOnly = void 0;
|
|
4
|
+
const colorette_1 = require("colorette");
|
|
5
|
+
const utils_1 = require("../utils");
|
|
6
|
+
const error_1 = require("../error");
|
|
7
|
+
const functional_1 = require("../functional");
|
|
8
|
+
const fsutils_1 = require("../fsutils");
|
|
9
|
+
const projectPath_1 = require("../projectPath");
|
|
10
|
+
const path_1 = require("path");
|
|
11
|
+
const experiments = require("../experiments");
|
|
12
|
+
function matchingConfigs(configs, targets, assertMatches) {
|
|
13
|
+
const matches = [];
|
|
14
|
+
const [hasSite, hasTarget] = (0, functional_1.partition)(configs, (c) => "site" in c);
|
|
15
|
+
for (const target of targets) {
|
|
16
|
+
const siteMatch = hasSite.find((c) => c.site === target);
|
|
17
|
+
const targetMatch = hasTarget.find((c) => c.target === target);
|
|
18
|
+
if (siteMatch) {
|
|
19
|
+
matches.push(siteMatch);
|
|
20
|
+
}
|
|
21
|
+
else if (targetMatch) {
|
|
22
|
+
matches.push(targetMatch);
|
|
23
|
+
}
|
|
24
|
+
else if (assertMatches) {
|
|
25
|
+
throw new error_1.FirebaseError(`Hosting site or target ${(0, colorette_1.bold)(target)} not detected in firebase.json`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return matches;
|
|
29
|
+
}
|
|
30
|
+
function filterOnly(configs, onlyString) {
|
|
31
|
+
if (!onlyString) {
|
|
32
|
+
return configs;
|
|
33
|
+
}
|
|
34
|
+
let onlyTargets = onlyString.split(",");
|
|
35
|
+
if (onlyTargets.includes("hosting")) {
|
|
36
|
+
return configs;
|
|
37
|
+
}
|
|
38
|
+
onlyTargets = onlyTargets
|
|
39
|
+
.filter((target) => target.startsWith("hosting:"))
|
|
40
|
+
.map((target) => target.replace("hosting:", ""));
|
|
41
|
+
return matchingConfigs(configs, onlyTargets, true);
|
|
42
|
+
}
|
|
43
|
+
exports.filterOnly = filterOnly;
|
|
44
|
+
function filterExcept(configs, exceptOption) {
|
|
45
|
+
if (!exceptOption) {
|
|
46
|
+
return configs;
|
|
47
|
+
}
|
|
48
|
+
const exceptTargets = exceptOption.split(",");
|
|
49
|
+
if (exceptTargets.includes("hosting")) {
|
|
50
|
+
return [];
|
|
51
|
+
}
|
|
52
|
+
const exceptValues = exceptTargets
|
|
53
|
+
.filter((t) => t.startsWith("hosting:"))
|
|
54
|
+
.map((t) => t.replace("hosting:", ""));
|
|
55
|
+
const toReject = matchingConfigs(configs, exceptValues, false);
|
|
56
|
+
return configs.filter((c) => !toReject.find((r) => c.site === r.site && c.target === r.target));
|
|
57
|
+
}
|
|
58
|
+
exports.filterExcept = filterExcept;
|
|
59
|
+
function extract(options) {
|
|
60
|
+
const config = options.config.src;
|
|
61
|
+
if (!config.hosting) {
|
|
62
|
+
return [];
|
|
63
|
+
}
|
|
64
|
+
const assertOneTarget = (config) => {
|
|
65
|
+
if (config.target && config.site) {
|
|
66
|
+
throw new error_1.FirebaseError(`Hosting configs should only include either "site" or "target", not both.`);
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
if (!Array.isArray(config.hosting)) {
|
|
70
|
+
const res = (0, utils_1.cloneDeep)(config.hosting);
|
|
71
|
+
if (!res.target && !res.site) {
|
|
72
|
+
res.site = options.site;
|
|
73
|
+
}
|
|
74
|
+
assertOneTarget(res);
|
|
75
|
+
return [res];
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
config.hosting.forEach(assertOneTarget);
|
|
79
|
+
return (0, utils_1.cloneDeep)(config.hosting);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
exports.extract = extract;
|
|
83
|
+
function validate(configs, options) {
|
|
84
|
+
for (const config of configs) {
|
|
85
|
+
validateOne(config, options);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
exports.validate = validate;
|
|
89
|
+
function validateOne(config, options) {
|
|
90
|
+
var _a, _b, _c, _d;
|
|
91
|
+
const hasAnyStaticRewrites = !!((_a = config.rewrites) === null || _a === void 0 ? void 0 : _a.find((rw) => "destination" in rw));
|
|
92
|
+
const hasAnyDynamicRewrites = !!((_b = config.rewrites) === null || _b === void 0 ? void 0 : _b.find((rw) => !("destination" in rw)));
|
|
93
|
+
const hasAnyRedirects = !!((_c = config.redirects) === null || _c === void 0 ? void 0 : _c.length);
|
|
94
|
+
if (config.source && config.public) {
|
|
95
|
+
throw new error_1.FirebaseError('Can only specify "source" or "public" in a Hosting config, not both');
|
|
96
|
+
}
|
|
97
|
+
const root = experiments.isEnabled("webframeworks")
|
|
98
|
+
? config.source || config.public
|
|
99
|
+
: config.public;
|
|
100
|
+
const orSource = experiments.isEnabled("webframeworks") ? ' or "source"' : "";
|
|
101
|
+
if (!root && hasAnyStaticRewrites) {
|
|
102
|
+
throw new error_1.FirebaseError(`Must supply a "public"${orSource} directory when using "destination" rewrites.`);
|
|
103
|
+
}
|
|
104
|
+
if (!root && !hasAnyDynamicRewrites && !hasAnyRedirects) {
|
|
105
|
+
throw new error_1.FirebaseError(`Must supply a "public"${orSource} directory or at least one rewrite or redirect in each "hosting" config.`);
|
|
106
|
+
}
|
|
107
|
+
if (root && !(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, root))) {
|
|
108
|
+
throw new error_1.FirebaseError(`Specified "${config.source ? "source" : "public"}" directory "${root}" does not exist, can't deploy hosting to site "${config.site || config.target || ""}"`);
|
|
109
|
+
}
|
|
110
|
+
const regionWithoutFunction = (rewrite) => typeof rewrite.region === "string" && typeof rewrite.function !== "string";
|
|
111
|
+
const violation = (_d = config.rewrites) === null || _d === void 0 ? void 0 : _d.find(regionWithoutFunction);
|
|
112
|
+
if (violation) {
|
|
113
|
+
throw new error_1.FirebaseError("Rewrites only support 'region' as a top-level field when 'function' is set as a string");
|
|
114
|
+
}
|
|
115
|
+
if (config.i18n) {
|
|
116
|
+
if (!root) {
|
|
117
|
+
throw new error_1.FirebaseError(`Must supply a "public"${orSource} directory when using "i18n" configuration.`);
|
|
118
|
+
}
|
|
119
|
+
if (!config.i18n.root) {
|
|
120
|
+
throw new error_1.FirebaseError('Must supply a "root" in "i18n" config.');
|
|
121
|
+
}
|
|
122
|
+
const i18nPath = path_1.default.join(root, config.i18n.root);
|
|
123
|
+
if (!(0, fsutils_1.dirExistsSync)((0, projectPath_1.resolveProjectPath)(options, i18nPath))) {
|
|
124
|
+
(0, utils_1.logLabeledWarning)("hosting", `Couldn't find specified i18n root directory ${(0, colorette_1.bold)(config.i18n.root)} in public directory ${(0, colorette_1.bold)(root)}`);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
function resolveTargets(configs, options) {
|
|
129
|
+
return configs.map((config) => {
|
|
130
|
+
const newConfig = (0, utils_1.cloneDeep)(config);
|
|
131
|
+
if (config.site) {
|
|
132
|
+
return newConfig;
|
|
133
|
+
}
|
|
134
|
+
if (!config.target) {
|
|
135
|
+
throw new error_1.FirebaseError("Assertion failed: resolving hosting target of a site with no site name " +
|
|
136
|
+
"or target name. This should have caused an error earlier", { exit: 2 });
|
|
137
|
+
}
|
|
138
|
+
if (!options.project) {
|
|
139
|
+
throw new error_1.FirebaseError("Assertion failed: options.project is not set. Commands depending on hosting.config should use requireProject", { exit: 2 });
|
|
140
|
+
}
|
|
141
|
+
const matchingTargets = options.rc.requireTarget(options.project, "hosting", config.target);
|
|
142
|
+
if (matchingTargets.length > 1) {
|
|
143
|
+
throw new error_1.FirebaseError(`Hosting target ${(0, colorette_1.bold)(config.target)} is linked to multiple sites, ` +
|
|
144
|
+
`but only one is permitted. ` +
|
|
145
|
+
`To clear, run:\n\n ${(0, colorette_1.bold)(`firebase target:clear hosting ${config.target}`)}`);
|
|
146
|
+
}
|
|
147
|
+
newConfig.site = matchingTargets[0];
|
|
148
|
+
return newConfig;
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
exports.resolveTargets = resolveTargets;
|
|
152
|
+
function isLegacyFunctionsRewrite(rewrite) {
|
|
153
|
+
return "function" in rewrite && typeof rewrite.function === "string";
|
|
154
|
+
}
|
|
155
|
+
function normalize(configs) {
|
|
156
|
+
var _a;
|
|
157
|
+
for (const config of configs) {
|
|
158
|
+
config.rewrites = (_a = config.rewrites) === null || _a === void 0 ? void 0 : _a.map((rewrite) => {
|
|
159
|
+
if (!("function" in rewrite)) {
|
|
160
|
+
return rewrite;
|
|
161
|
+
}
|
|
162
|
+
if (isLegacyFunctionsRewrite(rewrite)) {
|
|
163
|
+
const modern = Object.assign(Object.assign({}, rewrite), { function: {
|
|
164
|
+
functionId: rewrite.function,
|
|
165
|
+
} });
|
|
166
|
+
delete modern.region;
|
|
167
|
+
if ("region" in rewrite && typeof rewrite.region === "string") {
|
|
168
|
+
modern.function.region = rewrite.region;
|
|
169
|
+
}
|
|
170
|
+
if (rewrite.region) {
|
|
171
|
+
modern.function.region = rewrite.region;
|
|
172
|
+
}
|
|
173
|
+
return modern;
|
|
174
|
+
}
|
|
175
|
+
return rewrite;
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
exports.normalize = normalize;
|
|
180
|
+
function hostingConfig(options) {
|
|
181
|
+
if (!options.normalizedHostingConfig) {
|
|
182
|
+
let configs = extract(options);
|
|
183
|
+
configs = filterOnly(configs, options.only);
|
|
184
|
+
configs = filterExcept(configs, options.except);
|
|
185
|
+
normalize(configs);
|
|
186
|
+
validate(configs, options);
|
|
187
|
+
const resolved = resolveTargets(configs, options);
|
|
188
|
+
options.normalizedHostingConfig = resolved;
|
|
189
|
+
}
|
|
190
|
+
return options.normalizedHostingConfig;
|
|
191
|
+
}
|
|
192
|
+
exports.hostingConfig = hostingConfig;
|
|
193
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/hosting/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const DURATIONS = {
|
|
|
16
16
|
};
|
|
17
17
|
exports.MAX_DURATION = 30 * Duration.DAY;
|
|
18
18
|
exports.DEFAULT_DURATION = 7 * Duration.DAY;
|
|
19
|
-
function calculateChannelExpireTTL(flag
|
|
19
|
+
function calculateChannelExpireTTL(flag) {
|
|
20
20
|
const match = exports.DURATION_REGEX.exec(flag);
|
|
21
21
|
if (!match) {
|
|
22
22
|
throw new error_1.FirebaseError(`"expires" flag must be a duration string (e.g. 24h or 7d) at most 30d`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expireUtils.js","sourceRoot":"","sources":["../../src/hosting/expireUtils.ts"],"names":[],"mappings":";;;AAAA,oCAAyC;
|
|
1
|
+
{"version":3,"file":"expireUtils.js","sourceRoot":"","sources":["../../src/hosting/expireUtils.ts"],"names":[],"mappings":";;;AAAA,oCAAyC;AAM5B,QAAA,cAAc,GAAG,gBAAgB,CAAC;AAK/C,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,+CAAkB,CAAA;IAClB,6CAAqB,CAAA;IACrB,4CAAyB,CAAA;AAC3B,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB;AAED,MAAM,SAAS,GAA8B;IAC3C,CAAC,EAAE,QAAQ,CAAC,MAAM;IAClB,CAAC,EAAE,QAAQ,CAAC,IAAI;IAChB,CAAC,EAAE,QAAQ,CAAC,GAAG;CAChB,CAAC;AAKW,QAAA,YAAY,GAAG,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC;AAKjC,QAAA,gBAAgB,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;AAQjD,SAAgB,yBAAyB,CAAC,IAA4C;IACpF,MAAM,KAAK,GAAG,sBAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,qBAAa,CACrB,uEAAuE,CACxE,CAAC;KACH;IACD,MAAM,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;QACZ,MAAM,IAAI,qBAAa,CAAC,yCAAyC,IAAI,GAAG,CAAC,CAAC;KAC3E;IACD,IAAI,CAAC,GAAG,oBAAY,EAAE;QACpB,MAAM,IAAI,qBAAa,CAAC,2CAA2C,CAAC,CAAC;KACtE;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAfD,8DAeC"}
|
|
@@ -17,19 +17,26 @@ function functionsProxy(options) {
|
|
|
17
17
|
exit: 2,
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
let functionId;
|
|
21
|
+
let region;
|
|
22
|
+
if (typeof rewrite.function === "string") {
|
|
23
|
+
functionId = rewrite.function;
|
|
24
|
+
region = rewrite.region || "us-central1";
|
|
22
25
|
}
|
|
23
|
-
|
|
26
|
+
else {
|
|
27
|
+
functionId = rewrite.function.functionId;
|
|
28
|
+
region = rewrite.function.region || "us-central1";
|
|
29
|
+
}
|
|
30
|
+
let url = `https://${region}-${projectId}.cloudfunctions.net/${functionId}`;
|
|
24
31
|
let destLabel = "live";
|
|
25
32
|
if ((0, lodash_1.includes)(options.targets, "functions")) {
|
|
26
33
|
destLabel = "local";
|
|
27
34
|
const functionsEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
|
|
28
35
|
if (functionsEmu) {
|
|
29
|
-
url = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(functionsEmu.getInfo().host, functionsEmu.getInfo().port, projectId,
|
|
36
|
+
url = functionsEmulator_1.FunctionsEmulator.getHttpFunctionUrl(functionsEmu.getInfo().host, functionsEmu.getInfo().port, projectId, functionId, region);
|
|
30
37
|
}
|
|
31
38
|
}
|
|
32
|
-
resolve((0, proxy_1.proxyRequestHandler)(url, `${destLabel} Function ${
|
|
39
|
+
resolve((0, proxy_1.proxyRequestHandler)(url, `${destLabel} Function ${region}/${functionId}`));
|
|
33
40
|
});
|
|
34
41
|
};
|
|
35
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functionsProxy.js","sourceRoot":"","sources":["../../src/hosting/functionsProxy.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAGlC,mCAA8C;AAC9C,kDAAgD;AAChD,mDAAwD;AACxD,6CAA8C;AAC9C,qEAAkE;AAElE,oCAAyC;AAazC,SAAgB,cAAc,CAC5B,OAA8B;IAE9B,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,OAAO,CAAC,CAAC;YACzC,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,EAAE;gBAC5B,MAAM,IAAI,qBAAa,CAAC,yDAAyD,EAAE;oBACjF,IAAI,EAAE,CAAC;iBACR,CAAC,CAAC;aACJ;YACD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"functionsProxy.js","sourceRoot":"","sources":["../../src/hosting/functionsProxy.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAGlC,mCAA8C;AAC9C,kDAAgD;AAChD,mDAAwD;AACxD,6CAA8C;AAC9C,qEAAkE;AAElE,oCAAyC;AAazC,SAAgB,cAAc,CAC5B,OAA8B;IAE9B,OAAO,CAAC,OAAwB,EAAE,EAAE;QAClC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,SAAS,GAAG,IAAA,4BAAa,EAAC,OAAO,CAAC,CAAC;YACzC,IAAI,CAAC,CAAC,UAAU,IAAI,OAAO,CAAC,EAAE;gBAC5B,MAAM,IAAI,qBAAa,CAAC,yDAAyD,EAAE;oBACjF,IAAI,EAAE,CAAC;iBACR,CAAC,CAAC;aACJ;YACD,IAAI,UAAkB,CAAC;YACvB,IAAI,MAAc,CAAC;YACnB,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACxC,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC;gBAC9B,MAAM,GAAI,OAAkC,CAAC,MAAM,IAAI,aAAa,CAAC;aACtE;iBAAM;gBACL,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACzC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,IAAI,aAAa,CAAC;aACnD;YACD,IAAI,GAAG,GAAG,WAAW,MAAM,IAAI,SAAS,uBAAuB,UAAU,EAAE,CAAC;YAC5E,IAAI,SAAS,GAAG,MAAM,CAAC;YAEvB,IAAI,IAAA,iBAAQ,EAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE;gBAC1C,SAAS,GAAG,OAAO,CAAC;gBAIpB,MAAM,YAAY,GAAG,2BAAgB,CAAC,GAAG,CAAC,iBAAS,CAAC,SAAS,CAAC,CAAC;gBAC/D,IAAI,YAAY,EAAE;oBAChB,GAAG,GAAG,qCAAiB,CAAC,kBAAkB,CACxC,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAC3B,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAC3B,SAAS,EACT,UAAU,EACV,MAAM,CACP,CAAC;iBACH;aACF;YAED,OAAO,CAAC,IAAA,2BAAmB,EAAC,GAAG,EAAE,GAAG,SAAS,aAAa,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA3CD,wCA2CC"}
|
|
@@ -1,20 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initMiddleware = void 0;
|
|
4
|
-
const url = require("url");
|
|
5
|
-
const qs = require("querystring");
|
|
6
4
|
const apiv2_1 = require("../apiv2");
|
|
7
5
|
const logger_1 = require("../logger");
|
|
8
6
|
const utils = require("../utils");
|
|
9
7
|
const SDK_PATH_REGEXP = /^\/__\/firebase\/([^/]+)\/([^/]+)$/;
|
|
10
8
|
function initMiddleware(init) {
|
|
11
9
|
return (req, res, next) => {
|
|
12
|
-
const parsedUrl =
|
|
13
|
-
const match = RegExp(SDK_PATH_REGEXP).exec(
|
|
10
|
+
const parsedUrl = new URL(req.url || "", `http://${req.headers.host}`);
|
|
11
|
+
const match = RegExp(SDK_PATH_REGEXP).exec(parsedUrl.pathname);
|
|
14
12
|
if (match) {
|
|
15
13
|
const version = match[1];
|
|
16
14
|
const sdkName = match[2];
|
|
17
|
-
const u = new
|
|
15
|
+
const u = new URL(`https://www.gstatic.com/firebasejs/${version}/${sdkName}`);
|
|
18
16
|
const c = new apiv2_1.Client({ urlPrefix: u.origin, auth: false });
|
|
19
17
|
const headers = {};
|
|
20
18
|
const acceptEncoding = req.headers["accept-encoding"];
|
|
@@ -44,9 +42,9 @@ function initMiddleware(init) {
|
|
|
44
42
|
});
|
|
45
43
|
}
|
|
46
44
|
else if (parsedUrl.pathname === "/__/firebase/init.js") {
|
|
47
|
-
const query =
|
|
45
|
+
const query = parsedUrl.searchParams;
|
|
48
46
|
res.setHeader("Content-Type", "application/javascript");
|
|
49
|
-
if (query
|
|
47
|
+
if (query.get("useEmulator") === "true") {
|
|
50
48
|
res.end(init.emulatorsJs);
|
|
51
49
|
}
|
|
52
50
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initMiddleware.js","sourceRoot":"","sources":["../../src/hosting/initMiddleware.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"initMiddleware.js","sourceRoot":"","sources":["../../src/hosting/initMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/hosting/options.ts"],"names":[],"mappings":";;AA6BA,MAAM,wBAAwB,GAAwC,IAAI,CAAC"}
|