@angular/fire 7.1.0-rc.3 → 7.1.1-canary.5ecf875

package/schematics/firebaseTools.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirebaseTools = void 0;
 const child_process_1 = require("child_process");
 const ora_1 = __importDefault(require("ora"));
+const semver = __importStar(require("semver"));
 const getFirebaseTools = () => globalThis.firebaseTools ?
     Promise.resolve(globalThis.firebaseTools) :
     new Promise((resolve, reject) => {
@@ -43,8 +63,8 @@ const getFirebaseTools = () => globalThis.firebaseTools ?
         globalThis.firebaseTools = firebaseTools;
         const version = firebaseTools.cli.version();
         console.log(`Using firebase-tools version ${version}`);
-        if (parseInt(version, 10) !== 9) {
-            console.error('firebase-tools version 9 is required');
+        if (semver.compare(version, '9.9.0') === -1) {
+            console.error('firebase-tools version 9.9+ is required, please upgrade and run again');
             return Promise.reject();
         }
         return firebaseTools;

package/schematics/setup/index.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAddSetupProject = exports.setupProject = void 0;
+const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
 const prompts_1 = require("./prompts");
@@ -82,10 +83,16 @@ ${Object.entries(config.sdkConfig).reduce((c, [k, v]) => c.concat(`    ${k}: '${
             default: throw (new schematics_1.SchematicsException(`Unimplemented PROJECT_TYPE ${config.projectType}`));
         }
     }
+    else {
+        return Promise.resolve();
+    }
 });
 exports.setupProject = setupProject;
 const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void 0, void 0, function* () {
-    const projectRoot = host._backend._root;
+    let projectRoot = host._backend._root;
+    if (process.platform.startsWith('win32')) {
+        projectRoot = core_1.asWindowsPath(core_1.normalize(projectRoot));
+    }
     const features = yield prompts_1.featuresPrompt();
     if (features.length > 0) {
         const firebaseTools = yield firebaseTools_1.getFirebaseTools();
@@ -96,7 +103,7 @@ const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void
         yield firebaseTools.login.use(user.email, { projectRoot });
         const { project: ngProject, projectName: ngProjectName } = utils_1.getProject(options, host);
         const [defaultProjectName] = utils_1.getFirebaseProjectNameFromHost(host, ngProjectName);
-        const firebaseProject = yield prompts_1.projectPrompt(defaultProjectName, { projectRoot });
+        const firebaseProject = yield prompts_1.projectPrompt(defaultProjectName, { projectRoot, account: user.email });
         let hosting = { projectType: 0, prerender: false };
         let firebaseHostingSite;
         if (features.includes(0)) {

package/schematics/setup/prompts.js

@@ -184,7 +184,7 @@ const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, voi
             message: 'What would you like to call your project?',
             default: projectId,
         });
-        return yield firebaseTools.projects.create(projectId, Object.assign(Object.assign({}, options), { displayName, nonInteractive: true }));
+        return yield firebaseTools.projects.create(projectId, { account: options.account, displayName, nonInteractive: true });
     }
     return (yield projects).find(it => it.projectId === projectId);
 });

package/schematics/setup/ssr.js

@@ -15,7 +15,13 @@ function generateHostingConfig(project, dist, functionName, projectType) {
                 source: '*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)',
                 headers: [{
                         key: 'Cache-Control',
-                        value: 'public,max-age=31536000,immutable'
+                        value: 'public,max-age=31536000,immutable',
+                    }]
+            }, {
+                source: '/@(ngsw-worker.js|ngsw.json)',
+                headers: [{
+                        key: 'Cache-Control',
+                        value: 'no-cache',
                     }]
             }],
         rewrites: [

package/schematics/setup/static.js

@@ -18,13 +18,19 @@ function generateHostingConfig(project, dist) {
                 source: '*.[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].+(css|js)',
                 headers: [{
                         key: 'Cache-Control',
-                        value: 'public,max-age=31536000,immutable'
-                    }]
+                        value: 'public,max-age=31536000,immutable',
+                    }],
+            }, {
+                source: '/@(ngsw-worker.js|ngsw.json)',
+                headers: [{
+                        key: 'Cache-Control',
+                        value: 'no-cache',
+                    }],
             }],
         rewrites: [
             {
                 source: '**',
-                destination: '/index.html'
+                destination: '/index.html',
             }
         ]
     };

package/schematics/utils.js

@@ -155,7 +155,7 @@ function addToNgModule(host, options) {
     }
     if (options.features.includes(2) &&
         !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideAnalytics')) {
-        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideAnalytics', 'getAnalytics'], '@angular/fire/analytics'), ...ast_utils_1.addImportToModule(source, modulePath, `provideAnalytics(() => getAnalytics())`, null));
+        changes.push(ast_utils_1.insertImport(source, modulePath, ['provideAnalytics', 'getAnalytics', 'ScreenTrackingService', 'UserTrackingService'], '@angular/fire/analytics'), ...ast_utils_1.addImportToModule(source, modulePath, `provideAnalytics(() => getAnalytics())`, null), ...ast_utils_1.addProviderToModule(source, modulePath, ['ScreenTrackingService', 'UserTrackingService'], null));
     }
     if (options.features.includes(1) &&
         !ast_utils_1.findNode(source, typescript_1.default.SyntaxKind.Identifier, 'provideAuth')) {

package/schematics/versions.json

@@ -2,7 +2,7 @@
   "peerDependencies": {
     "firebase": {
       "dev": false,
-      "version": "^9.0.0"
+      "version": "^9.1.0"
     },
     "rxfire": {
       "dev": false,

package/storage/storage.module.d.ts

@@ -1,15 +1,15 @@
-import { NgZone, InjectionToken, ModuleWithProviders } from '@angular/core';
+import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
 import { FirebaseStorage } from 'firebase/storage';
 import { Storage } from './storage';
 import { FirebaseApp } from '@angular/fire/app';
 import * as i0 from "@angular/core";
 export declare const PROVIDED_STORAGE_INSTANCES: InjectionToken<Storage[]>;
 export declare function defaultStorageInstanceFactory(provided: FirebaseStorage[] | undefined, defaultApp: FirebaseApp): Storage;
-export declare function storageInstanceFactory(fn: () => FirebaseStorage): (zone: NgZone) => Storage;
+export declare function storageInstanceFactory(fn: (injector: Injector) => FirebaseStorage): (zone: NgZone, injector: Injector) => Storage;
 export declare class StorageModule {
     constructor();
     static ɵfac: i0.ɵɵFactoryDeclaration<StorageModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<StorageModule, never, never, never>;
     static ɵinj: i0.ɵɵInjectorDeclaration<StorageModule>;
 }
-export declare function provideStorage(fn: () => FirebaseStorage): ModuleWithProviders<StorageModule>;
+export declare function provideStorage(fn: () => FirebaseStorage, ...deps: any[]): ModuleWithProviders<StorageModule>;