@angular/fire 16.0.0 → 17.0.0-canary.6604db7

package/schematics/setup/index.js

@@ -34,10 +34,8 @@ const setupProject = (tree, context, features, config) => {
                 firebaseApp: config.firebaseApp,
                 firebaseHostingSite: config.firebaseHostingSite,
                 sdkConfig: config.sdkConfig,
-                prerender: undefined,
-                browserTarget: config.browserTarget,
-                serverTarget: config.serverTarget,
-                prerenderTarget: config.prerenderTarget,
+                buildTarget: config.buildTarget,
+                serveTarget: config.serveTarget,
                 ssrRegion: config.ssrRegion,
             },
             tree,
@@ -69,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 });
@@ -122,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) {
@@ -129,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: 'development',
     };
     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,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addIgnoreFiles = exports.featureToRules = 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");
@@ -14,6 +14,8 @@ const change_1 = require("@schematics/angular/utility/change");
 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(); };

package/storage/package.json

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