@angular/fire 7.2.0 → 7.3.0-canary.8d5bc12

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/ng-packagr/package.schema.json",
   "name": "@angular/fire",
-  "version": "7.2.0",
+  "version": "7.3.0-canary.8d5bc12",
   "description": "The official Angular library for Firebase.",
   "schematics": "./schematics/collection.json",
   "builders": "./schematics/builders.json",
@@ -27,10 +27,8 @@
     "@angular/core": "^12.0.0 || ^13.0.0",
     "@angular/platform-browser": "^12.0.0 || ^13.0.0",
     "@angular/platform-browser-dynamic": "^12.0.0 || ^13.0.0",
-    "firebase": "^9.4.0",
-    "rxfire": "^6.0.0",
     "rxjs": "~6.6.0 || ^7.0.0",
-    "firebase-tools": "^9.9.0"
+    "firebase-tools": "^9.9.0 || ^10.0.0"
   },
   "peerDependenciesMeta": {
     "firebase-tools": {
@@ -38,6 +36,8 @@
     }
   },
   "dependencies": {
+    "firebase": "^9.5.0",
+    "rxfire": "^6.0.0",
     "@angular-devkit/schematics": "^12.0.0 || ^13.0.0",
     "@schematics/angular": "^12.0.0 || ^13.0.0",
     "tslib": "^2.0.0",

package/performance/performance.module.d.ts

@@ -12,4 +12,4 @@ export declare class PerformanceModule {
     static ɵmod: i0.ɵɵNgModuleDeclaration<PerformanceModule, never, never, never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<PerformanceModule>;
 }
-export declare function providePerformance(fn: () => FirebasePerformance, ...deps: any[]): ModuleWithProviders<PerformanceModule>;
+export declare function providePerformance(fn: (injector: Injector) => FirebasePerformance, ...deps: any[]): ModuleWithProviders<PerformanceModule>;

package/remote-config/remote-config.module.d.ts

@@ -12,4 +12,4 @@ export declare class RemoteConfigModule {
     static ɵmod: i0.ɵɵNgModuleDeclaration<RemoteConfigModule, never, never, never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<RemoteConfigModule>;
 }
-export declare function provideRemoteConfig(fn: () => FirebaseRemoteConfig, ...deps: any[]): ModuleWithProviders<RemoteConfigModule>;
+export declare function provideRemoteConfig(fn: (injector: Injector) => FirebaseRemoteConfig, ...deps: any[]): ModuleWithProviders<RemoteConfigModule>;

package/schematics/deploy/actions.js

@@ -193,7 +193,12 @@ const deployToFunction = (firebaseTools, context, workspaceRoot, staticBuildTarg
     }
     const functionsPackageJsonPath = path_1.join(functionsOut, 'package.json');
     fsHost.writeFileSync(functionsPackageJsonPath, JSON.stringify(packageJson, null, 2));
-    fsHost.writeFileSync(path_1.join(functionsOut, 'index.js'), functions_templates_1.defaultFunction(serverBuildOptions.outputPath, options, functionName));
+    if (options.CF3v2) {
+        fsHost.writeFileSync(path_1.join(functionsOut, 'index.js'), functions_templates_1.functionGen2(serverBuildOptions.outputPath, options, functionName));
+    }
+    else {
+        fsHost.writeFileSync(path_1.join(functionsOut, 'index.js'), functions_templates_1.defaultFunction(serverBuildOptions.outputPath, options, functionName));
+    }
     if (!options.prerender) {
         try {
             fsHost.renameSync(path_1.join(newStaticOut, 'index.html'), path_1.join(newStaticOut, 'index.original.html'));

package/schematics/deploy/functions-templates.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dockerfile = exports.defaultFunction = exports.defaultPackage = exports.DEFAULT_FUNCTION_NAME = exports.DEFAULT_NODE_VERSION = void 0;
+exports.dockerfile = exports.functionGen2 = exports.defaultFunction = exports.defaultPackage = exports.DEFAULT_FUNCTION_NAME = exports.DEFAULT_NODE_VERSION = void 0;
 exports.DEFAULT_NODE_VERSION = 14;
 exports.DEFAULT_FUNCTION_NAME = 'ssr';
 const DEFAULT_FUNCTION_REGION = 'us-central1';
@@ -37,6 +37,16 @@ exports.${functionName || exports.DEFAULT_FUNCTION_NAME} = functions
   .onRequest(expressApp);
 `;
 exports.defaultFunction = defaultFunction;
+const functionGen2 = (path, options, functionName) => `const { onRequest } = require('firebase-functions/v2/https');
+
+// Increase readability in Cloud Logging
+require("firebase-functions/lib/logger/compat");
+
+const expressApp = require('./${path}/main').app();
+
+exports.${functionName || exports.DEFAULT_FUNCTION_NAME} = onRequest(${JSON.stringify(Object.assign({ region: options.region || DEFAULT_FUNCTION_REGION }, (options.functionsRuntimeOptions || DEFAULT_RUNTIME_OPTIONS)))}, expressApp);
+`;
+exports.functionGen2 = functionGen2;
 const dockerfile = (options) => `FROM node:${options.functionsNodeVersion || exports.DEFAULT_NODE_VERSION}-slim
 WORKDIR /usr/src/app
 COPY package*.json ./

package/schematics/deploy/schema.json

@@ -30,7 +30,7 @@
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "ssr": {
-      "type": ["boolean", "string"],
+      "oneOf": [{ "type": "boolean" }, { "type": "string" }],
       "description": "Should we attempt to deploy the function to Cloud Functions (true or 'cloud-functions') / Cloud Run ('cloud-run') or just Hosting (false)"
     },
     "prerender": {
@@ -54,9 +54,13 @@
       "description": "The name of the Cloud Function or Cloud Run serviceId to deploy SSR to"
     },
     "functionsNodeVersion": {
-      "type": ["number", "string"],
+      "oneOf": [{ "type": "number" }, { "type": "string" }],
       "description": "Version of Node.js to run Cloud Functions / Run on"
     },
+    "CF3v2": {
+      "type": "boolean",
+      "description": "Generation of the Functions product to run on"
+    },
     "region": {
       "type": "string",
       "description": "The region to deploy Cloud Functions or Cloud Run to"
@@ -82,12 +86,12 @@
           "description": "Set a CPU limit in Kubernetes cpu units."
         },
         "maxConcurrency": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "Set the maximum number of concurrent requests allowed per container instance. If concurrency is unspecified, any number of concurrent requests are allowed. To unset this field, provide the special value default."
         },
         "maxInstances": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "The maximum number of container instances of the Service to run. Use 'default' to unset the limit and use the platform default."
         },
@@ -97,7 +101,7 @@
           "description": "Set a memory limit. Ex: 1Gi, 512Mi."
         },
         "minInstances": {
-          "type": ["number", "string"],
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
           "pattern": "^(\\d+|default)$",
           "description": "The minimum number of container instances of the Service to run or 'default' to remove any minimum."
         },

package/schematics/setup/prompts.js

@@ -47,7 +47,7 @@ const isApp = (elem) => {
 const isSite = (elem) => {
     return elem.original === undefined;
 };
-const searchProjects = (promise) => (_, input) => promise.then(projects => {
+const searchProjects = (projects) => (_, input) => __awaiter(void 0, void 0, void 0, function* () {
     projects.unshift({
         projectId: NEW_OPTION,
         displayName: '[CREATE NEW PROJECT]'
@@ -72,7 +72,7 @@ const searchProjects = (promise) => (_, input) => promise.then(projects => {
     });
 });
 exports.searchProjects = searchProjects;
-const searchApps = (promise) => (_, input) => promise.then(apps => {
+const searchApps = (apps) => (_, input) => __awaiter(void 0, void 0, void 0, function* () {
     apps.unshift({
         appId: NEW_OPTION,
         displayName: '[CREATE NEW APP]',
@@ -97,7 +97,7 @@ const searchApps = (promise) => (_, input) => promise.then(apps => {
     });
 });
 exports.searchApps = searchApps;
-const searchSites = (promise) => (_, input) => promise.then(sites => {
+const searchSites = (sites) => (_, input) => __awaiter(void 0, void 0, void 0, function* () {
     sites.unshift({
         name: NEW_OPTION,
         defaultUrl: '[CREATE NEW SITE]',
@@ -164,7 +164,7 @@ const userPrompt = (options) => __awaiter(void 0, void 0, void 0, function* () {
 exports.userPrompt = userPrompt;
 const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, void 0, function* () {
     const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-    const projects = firebaseTools.projects.list(options);
+    const projects = yield firebaseTools.projects.list(options);
     const { projectId } = yield autocomplete({
         type: 'autocomplete',
         name: 'projectId',
@@ -191,7 +191,7 @@ const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, voi
 exports.projectPrompt = projectPrompt;
 const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(void 0, void 0, void 0, function* () {
     const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-    const apps = firebaseTools.apps.list('web', Object.assign(Object.assign({}, options), { project }));
+    const apps = yield firebaseTools.apps.list('web', Object.assign(Object.assign({}, options), { project }));
     const { appId } = yield autocomplete({
         type: 'autocomplete',
         name: 'appId',
@@ -212,7 +212,7 @@ const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(v
 exports.appPrompt = appPrompt;
 const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0, void 0, function* () {
     const firebaseTools = yield firebaseTools_1.getFirebaseTools();
-    const sites = firebaseTools.hosting.sites.list(Object.assign(Object.assign({}, options), { project })).then(it => {
+    const sites = yield firebaseTools.hosting.sites.list(Object.assign(Object.assign({}, options), { project })).then(it => {
         if (it.sites.length === 0) {
             return [{
                     name: project,
@@ -230,7 +230,7 @@ const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0
         name: 'siteName',
         source: exports.searchSites(sites),
         message: 'Please select a hosting site:',
-        default: _ => sites.then(it => common_1.shortSiteName(it.find(it => it.type === DEFAULT_SITE_TYPE))),
+        default: _ => common_1.shortSiteName(sites.find(site => site.type === DEFAULT_SITE_TYPE)),
     });
     if (siteName === NEW_OPTION) {
         const { subdomain } = yield inquirer.prompt({

package/schematics/utils.js

@@ -127,12 +127,9 @@ function addFixesToServer(host, options) {
     }
     const sourceText = text.toString('utf-8');
     const addZonePatch = !sourceText.includes('import \'zone.js/dist/zone-patch-rxjs\';');
-    const addFirestorePatch = options.features.includes(7) &&
-        !sourceText.includes('import \'@angular/fire/firestore-protos\';');
-    if (addZonePatch || addFirestorePatch) {
+    if (addZonePatch) {
         common_1.overwriteIfExists(host, serverPath, sourceText.replace('import \'zone.js/dist/zone-node\';', `import 'zone.js/dist/zone-node';
-${addZonePatch ? 'import \'zone.js/dist/zone-patch-rxjs\';' : ''}
-${addFirestorePatch ? 'import \'@angular/fire/firestore-protos\';' : ''}`));
+${addZonePatch ? 'import \'zone.js/dist/zone-patch-rxjs\';' : ''}`));
     }
     return host;
 }

package/schematics/versions.json

@@ -1,14 +1,5 @@
 {
-  "peerDependencies": {
-    "firebase": {
-      "dev": false,
-      "version": "^9.4.0"
-    },
-    "rxfire": {
-      "dev": false,
-      "version": "^6.0.0"
-    }
-  },
+  "peerDependencies": {},
   "firebaseFunctionsDependencies": {
     "firebase-admin": {
       "dev": false,

package/storage/firebase.d.ts

@@ -1,10 +1,13 @@
 export * from 'firebase/storage';
-import { connectStorageEmulator as _connectStorageEmulator, deleteObject as _deleteObject, getDownloadURL as _getDownloadURL, getMetadata as _getMetadata, getStorage as _getStorage, list as _list, listAll as _listAll, ref as _ref, updateMetadata as _updateMetadata, uploadBytes as _uploadBytes, uploadBytesResumable as _uploadBytesResumable, uploadString as _uploadString } from 'firebase/storage';
+import { connectStorageEmulator as _connectStorageEmulator, deleteObject as _deleteObject, getBlob as _getBlob, getBytes as _getBytes, getDownloadURL as _getDownloadURL, getMetadata as _getMetadata, getStorage as _getStorage, getStream as _getStream, list as _list, listAll as _listAll, ref as _ref, updateMetadata as _updateMetadata, uploadBytes as _uploadBytes, uploadBytesResumable as _uploadBytesResumable, uploadString as _uploadString } from 'firebase/storage';
 export declare const connectStorageEmulator: typeof _connectStorageEmulator;
 export declare const deleteObject: typeof _deleteObject;
+export declare const getBlob: typeof _getBlob;
+export declare const getBytes: typeof _getBytes;
 export declare const getDownloadURL: typeof _getDownloadURL;
 export declare const getMetadata: typeof _getMetadata;
 export declare const getStorage: typeof _getStorage;
+export declare const getStream: typeof _getStream;
 export declare const list: typeof _list;
 export declare const listAll: typeof _listAll;
 export declare const ref: typeof _ref;

package/storage/storage.module.d.ts

@@ -12,4 +12,4 @@ export declare class StorageModule {
     static ɵmod: i0.ɵɵNgModuleDeclaration<StorageModule, never, never, never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<StorageModule>;
 }
-export declare function provideStorage(fn: () => FirebaseStorage, ...deps: any[]): ModuleWithProviders<StorageModule>;
+export declare function provideStorage(fn: (injector: Injector) => FirebaseStorage, ...deps: any[]): ModuleWithProviders<StorageModule>;