@angular/fire 16.0.0-rc.0 → 17.0.0-canary.05e9da2

package/schematics/setup/index.js

@@ -14,64 +14,46 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const utility_1 = require("@schematics/angular/utility");
 const common_1 = require("../common");
 const firebaseTools_1 = require("../firebaseTools");
 const utils_1 = require("../utils");
 const prompts_1 = require("./prompts");
-const setupProject = (tree, context, features, config) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const { path: workspacePath, workspace } = (0, utils_1.getWorkspace)(tree);
-    const { project, projectName } = (0, utils_1.getProject)(config, tree);
-    const sourcePath = (_a = project.sourceRoot) !== null && _a !== void 0 ? _a : project.root;
+const setupProject = (tree, context, features, config) => {
+    const { projectName } = (0, utils_1.getProject)(config, tree);
     (0, utils_1.addIgnoreFiles)(tree);
-    const featuresToImport = features.filter(it => it !== 0);
-    if (featuresToImport.length > 0) {
-        (0, utils_1.addToNgModule)(tree, { features: featuresToImport, sourcePath });
-        (0, utils_1.addFixesToServer)(tree);
-    }
-    if (config.sdkConfig) {
-        const source = `
-  firebase: {
-${Object.entries(config.sdkConfig).reduce((c, [k, v]) => c.concat(`    ${k}: '${v}'`), []).join(',\n')},
-  }`;
-        const environmentPath = `${sourcePath}/environments/environment.ts`;
-        (0, utils_1.addEnvironmentEntry)(tree, `/${environmentPath}`, source);
-        Object.values(project.architect || {}).forEach(builder => {
-            Object.values(builder.configurations || {}).forEach(configuration => {
-                (configuration.fileReplacements || []).forEach((replacement) => {
-                    if (replacement.replace === environmentPath) {
-                        (0, utils_1.addEnvironmentEntry)(tree, `/${replacement.with}`, source);
-                    }
-                });
-            });
-        });
-    }
-    const options = {
-        project: projectName,
-        firebaseProject: config.firebaseProject,
-        firebaseApp: config.firebaseApp,
-        firebaseHostingSite: config.firebaseHostingSite,
-        sdkConfig: config.sdkConfig,
-        prerender: undefined,
-        browserTarget: config.browserTarget,
-        serverTarget: config.serverTarget,
-        prerenderTarget: config.prerenderTarget,
-        ssrRegion: config.ssrRegion,
-    };
     if (features.includes(0)) {
-        return (0, exports.setupFirebase)({
+        const { path: workspacePath, workspace } = (0, utils_1.getWorkspace)(tree);
+        const { project, projectName } = (0, utils_1.getProject)(config, tree);
+        (0, exports.setupFirebase)({
             workspace,
             workspacePath,
-            options,
+            options: {
+                project: projectName,
+                firebaseProject: config.firebaseProject,
+                firebaseApp: config.firebaseApp,
+                firebaseHostingSite: config.firebaseHostingSite,
+                sdkConfig: config.sdkConfig,
+                buildTarget: config.buildTarget,
+                serveTarget: config.serveTarget,
+                ssrRegion: config.ssrRegion,
+            },
             tree,
             context,
             project
         });
     }
-    else {
-        return Promise.resolve();
+    const featuresToImport = features.filter(it => it !== 0);
+    if (featuresToImport.length > 0) {
+        return (0, schematics_1.chain)([
+            (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                external('initializeApp', '@angular/fire/app');
+                return code `${external('provideFirebaseApp', '@angular/fire/app')}(() => initializeApp(${JSON.stringify(config.sdkConfig)}))`;
+            }),
+            ...(0, utils_1.featureToRules)(features, projectName),
+        ]);
     }
-});
+};
 exports.setupProject = setupProject;
 const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void 0, void 0, function* () {
     let projectRoot = host._backend._root;
@@ -85,7 +67,10 @@ const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void
             (0, fs_1.writeFileSync)((0, path_1.join)(projectRoot, 'firebase.json'), '{}');
         }
         const user = yield (0, prompts_1.userPrompt)({ projectRoot });
-        yield firebaseTools.login.use(user.email, { projectRoot });
+        const defaultUser = yield firebaseTools.login(options);
+        if (user.email !== (defaultUser === null || defaultUser === void 0 ? void 0 : defaultUser.email)) {
+            yield firebaseTools.login.use(user.email, { projectRoot });
+        }
         const { project: ngProject, projectName: ngProjectName } = (0, utils_1.getProject)(options, host);
         const [defaultProjectName] = (0, utils_1.getFirebaseProjectNameFromHost)(host, ngProjectName);
         const firebaseProject = yield (0, prompts_1.projectPrompt)(defaultProjectName, { projectRoot, account: user.email });
@@ -104,7 +89,7 @@ const ngAddSetupProject = (options) => (host, context) => __awaiter(void 0, void
             const result = yield firebaseTools.apps.sdkconfig('web', firebaseApp.appId, { nonInteractive: true, projectRoot });
             sdkConfig = result.sdkConfig;
         }
-        yield (0, exports.setupProject)(host, context, features, Object.assign(Object.assign(Object.assign({}, options), hosting), { firebaseProject, firebaseApp, firebaseHostingSite, sdkConfig }));
+        return (0, exports.setupProject)(host, context, features, Object.assign(Object.assign(Object.assign({}, options), hosting), { firebaseProject, firebaseApp, firebaseHostingSite, sdkConfig }));
     }
 });
 exports.ngAddSetupProject = ngAddSetupProject;
@@ -138,6 +123,7 @@ function generateFirebaseJson(tree, path, project, region) {
 }
 exports.generateFirebaseJson = generateFirebaseJson;
 const setupFirebase = (config) => {
+    var _a, _b, _c, _d;
     const { tree, workspacePath, workspace, options } = config;
     const project = workspace.projects[options.project];
     if (!project.architect) {
@@ -145,7 +131,20 @@ const setupFirebase = (config) => {
     }
     project.architect.deploy = {
         builder: '@angular/fire:deploy',
-        options: Object.assign(Object.assign({ version: 2, browserTarget: options.browserTarget }, (options.serverTarget ? { serverTarget: options.serverTarget } : {})), (options.prerenderTarget ? { prerenderTarget: options.prerenderTarget } : {}))
+        options: {
+            version: 2,
+        },
+        configurations: {
+            production: {
+                buildTarget: (_a = options.buildTarget) === null || _a === void 0 ? void 0 : _a[0],
+                serveTarget: (_b = options.serveTarget) === null || _b === void 0 ? void 0 : _b[0],
+            },
+            development: {
+                buildTarget: (_c = options.buildTarget) === null || _c === void 0 ? void 0 : _c[1],
+                serveTarget: (_d = options.serveTarget) === null || _d === void 0 ? void 0 : _d[1],
+            }
+        },
+        defaultConfiguration: 'production',
     };
     tree.overwrite(workspacePath, JSON.stringify(workspace, null, 2));
     generateFirebaseJson(tree, 'firebase.json', options.project, options.ssrRegion);

package/schematics/setup/prompts.js

@@ -33,6 +33,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectTypePrompt = exports.sitePrompt = exports.appPrompt = exports.projectPrompt = exports.userPrompt = exports.featuresPrompt = exports.searchSites = exports.searchApps = exports.searchProjects = void 0;
+const child_process_1 = require("child_process");
 const fuzzy = __importStar(require("fuzzy"));
 const inquirer = __importStar(require("inquirer"));
 const common_1 = require("../common");
@@ -141,15 +142,14 @@ exports.featuresPrompt = featuresPrompt;
 const userPrompt = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const firebaseTools = yield (0, firebaseTools_1.getFirebaseTools)();
-    const users = yield firebaseTools.login.list();
-    if (!users || users.length === 0) {
-        yield firebaseTools.login();
-        const user = yield firebaseTools.login(options);
-        return user;
+    let loginList = yield firebaseTools.login.list();
+    if (!Array.isArray(loginList) || loginList.length === 0) {
+        (0, child_process_1.spawnSync)('firebase login', { shell: true, cwd: options.projectRoot, stdio: 'inherit' });
+        return yield firebaseTools.login(options);
     }
     else {
         const defaultUser = yield firebaseTools.login(options);
-        const choices = users.map(({ user }) => ({ name: user.email, value: user }));
+        const choices = loginList.map(({ user }) => ({ name: user.email, value: user }));
         const newChoice = { name: '[Login in with another account]', value: NEW_OPTION };
         const { user } = yield inquirer.prompt({
             type: 'list',
@@ -159,8 +159,17 @@ const userPrompt = (options) => __awaiter(void 0, void 0, void 0, function* () {
             default: (_a = choices.find(it => it.value.email === defaultUser.email)) === null || _a === void 0 ? void 0 : _a.value,
         });
         if (user === NEW_OPTION) {
-            const { user } = yield firebaseTools.login.add();
-            return user;
+            (0, child_process_1.spawnSync)('firebase login:add', { shell: true, cwd: options.projectRoot, stdio: 'inherit' });
+            loginList = yield firebaseTools.login.list();
+            if (!Array.isArray(loginList)) {
+                throw new Error("firebase login:list did not respond as expected");
+            }
+            const priorEmails = choices.map(it => it.name);
+            const newLogin = loginList.find(it => !priorEmails.includes(it.user.email));
+            if (!newLogin) {
+                throw new Error("Did not find a new user.");
+            }
+            return newLogin.user;
         }
         return user;
     }
@@ -256,15 +265,11 @@ const ALLOWED_SSR_REGIONS = [
     { name: 'asia-east1 (Taiwan)', value: 'asia-east1' },
 ];
 const projectTypePrompt = (project, name) => __awaiter(void 0, void 0, void 0, function* () {
-    var _b, _c, _d, _e, _f, _g;
-    let serverTarget;
-    let browserTarget = `${name}:build:${((_c = (_b = project.architect) === null || _b === void 0 ? void 0 : _b.build) === null || _c === void 0 ? void 0 : _c.defaultConfiguration) || 'production'}`;
-    let prerenderTarget;
-    if ((0, utils_1.isUniversalApp)(project)) {
-        serverTarget = `${name}:server:${((_e = (_d = project.architect) === null || _d === void 0 ? void 0 : _d.server) === null || _e === void 0 ? void 0 : _e.defaultConfiguration) || 'production'}`;
-        browserTarget = `${name}:build:${((_g = (_f = project.architect) === null || _f === void 0 ? void 0 : _f.build) === null || _g === void 0 ? void 0 : _g.defaultConfiguration) || 'production'}`;
-        const prerender = (0, utils_1.hasPrerenderOption)(project);
-        prerenderTarget = prerender && `${name}:prerender:${prerender.defaultConfiguration || 'production'}`;
+    const buildTarget = [`${name}:build:production`, `${name}:build:development`];
+    const serveTarget = (0, utils_1.isUniversalApp)(project) ?
+        [`${name}:serve-ssr:production`, `${name}:serve-ssr:development`] :
+        [`${name}:serve:production`, `${name}:serve:development`];
+    if ((0, utils_1.isUniversalApp)(project) || (0, utils_1.isSSRApp)(project)) {
         const { ssrRegion } = yield inquirer.prompt({
             type: 'list',
             name: 'ssrRegion',
@@ -272,8 +277,8 @@ const projectTypePrompt = (project, name) => __awaiter(void 0, void 0, void 0, f
             message: 'In which region would you like to host server-side content?',
             default: DEFAULT_REGION,
         });
-        return { prerender, projectType: 3, ssrRegion, browserTarget, serverTarget, prerenderTarget };
+        return { projectType: 3, ssrRegion, buildTarget, serveTarget };
     }
-    return { projectType: 3, browserTarget, serverTarget, prerenderTarget };
+    return { projectType: 3, buildTarget, serveTarget };
 });
 exports.projectTypePrompt = projectTypePrompt;

package/schematics/utils.js

@@ -3,17 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIgnoreFiles = exports.addToNgModule = exports.addFixesToServer = exports.addEnvironmentEntry = exports.getFirebaseProjectNameFromFs = exports.getFirebaseProjectNameFromHost = exports.getProject = exports.getWorkspace = exports.shortAppId = exports.hasPrerenderOption = exports.isUniversalApp = void 0;
+exports.addIgnoreFiles = exports.featureToRules = exports.addFixesToServer = exports.addEnvironmentEntry = exports.getFirebaseProjectNameFromFs = exports.getFirebaseProjectNameFromHost = exports.getProject = exports.getWorkspace = exports.shortAppId = exports.hasPrerenderOption = exports.isSSRApp = exports.isUniversalApp = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const schematics_1 = require("@angular-devkit/schematics");
 const typescript_1 = __importDefault(require("@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript"));
+const utility_1 = require("@schematics/angular/utility");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
-const find_module_1 = require("@schematics/angular/utility/find-module");
 const common_1 = require("./common");
 const isUniversalApp = (project) => { var _a; return (_a = project.architect) === null || _a === void 0 ? void 0 : _a.server; };
 exports.isUniversalApp = isUniversalApp;
+const isSSRApp = (project) => { var _a, _b; return !!((_b = (_a = project.architect) === null || _a === void 0 ? void 0 : _a.build.options) === null || _b === void 0 ? void 0 : _b.ssr); };
+exports.isSSRApp = isSSRApp;
 const hasPrerenderOption = (project) => { var _a; return (_a = project.architect) === null || _a === void 0 ? void 0 : _a.prerender; };
 exports.hasPrerenderOption = hasPrerenderOption;
 const shortAppId = (app) => { var _a; return (_a = app === null || app === void 0 ? void 0 : app.appId) === null || _a === void 0 ? void 0 : _a.split('/').pop(); };
@@ -138,64 +140,80 @@ ${addZonePatch ? 'import \'zone.js/dist/zone-patch-rxjs\';' : ''}`));
     return host;
 }
 exports.addFixesToServer = addFixesToServer;
-function addToNgModule(host, options) {
-    const modulePath = `/${options.sourcePath}/app/app.module.ts`;
-    if (!host.exists(modulePath)) {
-        throw new Error(`Specified module path ${modulePath} does not exist`);
-    }
-    const text = host.read(modulePath);
-    if (text === null) {
-        throw new schematics_1.SchematicsException(`File ${modulePath} does not exist.`);
-    }
-    const sourceText = text.toString('utf-8');
-    const source = typescript_1.default.createSourceFile(modulePath, sourceText, typescript_1.default.ScriptTarget.Latest, true);
-    const environmentsPath = (0, find_module_1.buildRelativePath)(modulePath, `/${options.sourcePath}/environments/environment`);
-    const changes = [];
-    if (!(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideFirebaseApp')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['initializeApp', 'provideFirebaseApp'], '@angular/fire/app'), (0, ast_utils_1.insertImport)(source, modulePath, 'environment', environmentsPath), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideFirebaseApp(() => initializeApp(environment.firebase))`, null));
-    }
-    if (options.features.includes(2) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideAnalytics')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideAnalytics', 'getAnalytics', 'ScreenTrackingService', 'UserTrackingService'], '@angular/fire/analytics'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideAnalytics(() => getAnalytics())`, null), ...(0, ast_utils_1.addProviderToModule)(source, modulePath, ['ScreenTrackingService', 'UserTrackingService'], null));
-    }
-    if (options.features.includes(1) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideAuth')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideAuth', 'getAuth'], '@angular/fire/auth'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideAuth(() => getAuth())`, null));
-    }
-    if (options.features.includes(3) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideDatabase')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideDatabase', 'getDatabase'], '@angular/fire/database'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideDatabase(() => getDatabase())`, null));
-    }
-    if (options.features.includes(7) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideFirestore')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideFirestore', 'getFirestore'], '@angular/fire/firestore'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideFirestore(() => getFirestore())`, null));
-    }
-    if (options.features.includes(4) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideFunctions')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideFunctions', 'getFunctions'], '@angular/fire/functions'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideFunctions(() => getFunctions())`, null));
-    }
-    if (options.features.includes(5) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideMessaging')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideMessaging', 'getMessaging'], '@angular/fire/messaging'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideMessaging(() => getMessaging())`, null));
-    }
-    if (options.features.includes(6) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'providePerformance')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['providePerformance', 'getPerformance'], '@angular/fire/performance'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `providePerformance(() => getPerformance())`, null));
-    }
-    if (options.features.includes(9) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideRemoteConfig')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideRemoteConfig', 'getRemoteConfig'], '@angular/fire/remote-config'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideRemoteConfig(() => getRemoteConfig())`, null));
-    }
-    if (options.features.includes(8) &&
-        !(0, ast_utils_1.findNode)(source, typescript_1.default.SyntaxKind.Identifier, 'provideStorage')) {
-        changes.push((0, ast_utils_1.insertImport)(source, modulePath, ['provideStorage', 'getStorage'], '@angular/fire/storage'), ...(0, ast_utils_1.addImportToModule)(source, modulePath, `provideStorage(() => getStorage())`, null));
-    }
-    const recorder = host.beginUpdate(modulePath);
-    (0, change_1.applyToUpdateRecorder)(recorder, changes);
-    host.commitUpdate(recorder);
-    return host;
+function featureToRules(features, projectName) {
+    return features.map(feature => {
+        switch (feature) {
+            case 3:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('initializeAppCheck', '@angular/fire/app-check');
+                    external('ReCaptchaEnterpriseProvider', '@angular/fire/app-check');
+                    return code `${external('provideAppCheck', '@angular/fire/app-check')}(() => {
+  // TODO get a reCAPTCHA Enterprise here https://console.cloud.google.com/security/recaptcha?project=_
+  const provider = new ReCaptchaEnterpriseProvider(/* reCAPTCHA Enterprise site key */);
+  return initializeAppCheck(undefined, { provider, isTokenAutoRefreshEnabled: true });
+})`;
+                });
+            case 2:
+                return (0, schematics_1.chain)([
+                    (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                        external('getAnalytics', '@angular/fire/analytics');
+                        return code `${external('provideAnalytics', '@angular/fire/analytics')}(() => getAnalytics())`;
+                    }),
+                    (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                        return code `${external('ScreenTrackingService', '@angular/fire/analytics')}`;
+                    }),
+                    ...(features.includes(1) ? [
+                        (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                            return code `${external('UserTrackingService', '@angular/fire/analytics')}`;
+                        })
+                    ] : []),
+                ]);
+            case 1:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getAuth', '@angular/fire/auth');
+                    return code `${external('provideAuth', '@angular/fire/auth')}(() => getAuth())`;
+                });
+            case 4:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getDatabase', '@angular/fire/database');
+                    return code `${external('provideDatabase', '@angular/fire/database')}(() => getDatabase())`;
+                });
+            case 8:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getFirestore', '@angular/fire/firestore');
+                    return code `${external('provideFirestore', '@angular/fire/firestore')}(() => getFirestore())`;
+                });
+            case 5:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getFunctions', '@angular/fire/functions');
+                    return code `${external('provideFunctions', '@angular/fire/functions')}(() => getFunctions())`;
+                });
+            case 6:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getMessaging', '@angular/fire/messaging');
+                    return code `${external('provideMessaging', '@angular/fire/messaging')}(() => getMessaging())`;
+                });
+            case 7:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getPerformance', '@angular/fire/performance');
+                    return code `${external('providePerformance', '@angular/fire/performance')}(() => getPerformance())`;
+                });
+            case 9:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getStorage', '@angular/fire/storage');
+                    return code `${external('provideStorage', '@angular/fire/storage')}(() => getStorage())`;
+                });
+            case 10:
+                return (0, utility_1.addRootProvider)(projectName, ({ code, external }) => {
+                    external('getRemoteConfig', '@angular/fire/remote-config');
+                    return code `${external('provideRemoteConfig', '@angular/fire/remote-config')}(() => getRemoteConfig())`;
+                });
+            default:
+                return undefined;
+        }
+    }).filter((it) => !!it);
 }
-exports.addToNgModule = addToNgModule;
+exports.featureToRules = featureToRules;
 const addIgnoreFiles = (host) => {
     const path = '/.gitignore';
     if (!host.exists(path)) {

package/storage/package.json

@@ -0,0 +1,3 @@
+{
+  "module": "../fesm2022/angular-fire-storage.mjs"
+}

package/storage/storage.module.d.ts

@@ -1,4 +1,4 @@
-import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { EnvironmentProviders, InjectionToken, Injector, NgZone } from '@angular/core';
 import { FirebaseApp } from '@angular/fire/app';
 import { FirebaseStorage } from 'firebase/storage';
 import { Storage } from './storage';
@@ -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: (injector: Injector) => FirebaseStorage, ...deps: any[]): ModuleWithProviders<StorageModule>;
+export declare function provideStorage(fn: (injector: Injector) => FirebaseStorage, ...deps: any[]): EnvironmentProviders;