Few things (#3472)

* Bump firebase, add auth#revokeAccessToken * Add development and production build/serve targets, default to development for emulators * Region select only when universal or ssr
angular · Dec 7, 2023 · 6604db7 · 6604db7
1 parent 99a1bb1
commit 6604db7
Show file tree

Hide file tree

Showing 9 changed files with 209 additions and 457 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,10 +55,10 @@
     "@angular/platform-browser-dynamic": "^17.0.0",
     "@angular/router": "^17.0.0",
     "@schematics/angular": "^17.0.0",
-    "firebase": "^10.0.0",
+    "firebase": "^10.7.0",
     "firebase-admin": "^9.11.1",
     "firebase-functions": "^3.6.0",
-    "firebase-tools": "^12.2.1",
+    "firebase-tools": "^13.0.0",
     "fs-extra": "^8.0.1",
     "fuzzy": "^0.1.3",
     "husky": "^4.2.5",

diff --git a/src/auth/firebase.ts b/src/auth/firebase.ts
diff --git a/src/package.json b/src/package.json
@@ -34,7 +34,7 @@
     "firebase-tools": { "optional": true }
   },
   "dependencies": {
-    "firebase": "^10.5.0",
+    "firebase": "^10.7.0",
     "rxfire": "^6.0.5",
     "@angular-devkit/schematics": "^17.0.0",
     "@schematics/angular": "^17.0.0",

diff --git a/src/schematics/interfaces.ts b/src/schematics/interfaces.ts
@@ -41,7 +41,8 @@ export interface NgAddNormalizedOptions {
   firebaseApp: FirebaseApp|undefined;
   firebaseHostingSite: FirebaseHostingSite|undefined;
   sdkConfig: Record<string, string>|undefined;
-  buildTarget: string|undefined;
+  buildTarget: [string,string]|undefined;
+  serveTarget: [string,string]|undefined;
   ssrRegion: string|undefined;
 }
 

diff --git a/src/schematics/ng-add.jasmine.ts b/src/schematics/ng-add.jasmine.ts
@@ -129,9 +129,10 @@ const initialAngularJson = `{
             "version": 2
           },
           "configurations": {
-            "production": {}
+            "production": {},
+            "development": {}
           },
-          "defaultConfiguration": "production"
+          "defaultConfiguration": "development"
         }
       }
     },
@@ -192,9 +193,10 @@ const overwriteAngularJson = `{
             "version": 2
           },
           "configurations": {
-            "production": {}
+            "production": {},
+            "development": {}
           },
-          "defaultConfiguration": "production"
+          "defaultConfiguration": "development"
         }
       }
     },
@@ -267,9 +269,10 @@ const projectAngularJson = `{
             "version": 2
           },
           "configurations": {
-            "production": {}
+            "production": {},
+            "development": {}
           },
-          "defaultConfiguration": "production"
+          "defaultConfiguration": "development"
         }
       }
     },
@@ -288,9 +291,10 @@ const projectAngularJson = `{
             "version": 2
           },
           "configurations": {
-            "production": {}
+            "production": {},
+            "development": {}
           },
-          "defaultConfiguration": "production"
+          "defaultConfiguration": "development"
         }
       }
     }

diff --git a/src/schematics/setup/index.ts b/src/schematics/setup/index.ts
@@ -27,7 +27,8 @@ export interface SetupConfig extends DeployOptions {
   firebaseApp?: FirebaseApp,
   firebaseHostingSite?: FirebaseHostingSite,
   sdkConfig?: Record<string, string>,
-  buildTarget?: string,
+  buildTarget?: [string, string],
+  serveTarget?: [string, string],
   project?: string,
   ssrRegion?: string,
 }
@@ -51,6 +52,7 @@ export const setupProject =
           firebaseHostingSite: config.firebaseHostingSite,
           sdkConfig: config.sdkConfig,
           buildTarget: config.buildTarget,
+          serveTarget: config.serveTarget,
           ssrRegion: config.ssrRegion,
         },
         tree,
@@ -187,10 +189,15 @@ export const setupFirebase = (config: {
     },
     configurations: {
       production: {
-        buildTarget: options.buildTarget,
+        buildTarget: options.buildTarget?.[0],
+        serveTarget: options.serveTarget?.[0],
       },
+      development: {
+        buildTarget: options.buildTarget?.[1],
+        serveTarget: options.serveTarget?.[1],
+      }
     },
-    defaultConfiguration: 'production',
+    defaultConfiguration: 'development',
   };
 
   tree.overwrite(workspacePath, JSON.stringify(workspace, null, 2));

diff --git a/src/schematics/setup/prompts.ts b/src/schematics/setup/prompts.ts
@@ -4,7 +4,7 @@ import * as inquirer from 'inquirer';
 import { shortSiteName } from '../common';
 import { getFirebaseTools } from '../firebaseTools';
 import { FEATURES, FirebaseApp, FirebaseHostingSite, FirebaseProject, PROJECT_TYPE, WorkspaceProject, featureOptions } from '../interfaces';
-import { shortAppId } from '../utils';
+import { isSSRApp, isUniversalApp, shortAppId } from '../utils';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
@@ -251,13 +251,19 @@ const ALLOWED_SSR_REGIONS = [
 ];
 
 export const projectTypePrompt = async (project: WorkspaceProject, name: string) => {
-  const buildTarget = `${name}:build:${project.architect?.build?.defaultConfiguration || 'production'}`;
-  const { ssrRegion } = await inquirer.prompt({
-    type: 'list',
-    name: 'ssrRegion',
-    choices: ALLOWED_SSR_REGIONS,
-    message: 'In which region would you like to host server-side content?',
-    default: DEFAULT_REGION,
-  }) as { ssrRegion: string };
-  return { projectType: PROJECT_TYPE.WebFrameworks, ssrRegion, buildTarget };
+  const buildTarget = [`${name}:build:production`, `${name}:build:development`];
+  const serveTarget = isUniversalApp(project) ?
+    [`${name}:serve-ssr:production`, `${name}:serve-ssr:development`] :
+    [`${name}:serve:production`, `${name}:serve:development`];
+  if (isUniversalApp(project) || isSSRApp(project)) {
+    const { ssrRegion } = await inquirer.prompt({
+      type: 'list',
+      name: 'ssrRegion',
+      choices: ALLOWED_SSR_REGIONS,
+      message: 'In which region would you like to host server-side content?',
+      default: DEFAULT_REGION,
+    }) as { ssrRegion: string };
+    return { projectType: PROJECT_TYPE.WebFrameworks, ssrRegion, buildTarget, serveTarget };
+  }
+  return { projectType: PROJECT_TYPE.WebFrameworks, buildTarget, serveTarget };
 };
diff --git a/src/schematics/utils.ts b/src/schematics/utils.ts
@@ -14,6 +14,10 @@ export const isUniversalApp = (
   project: WorkspaceProject
 ) => project.architect?.server;
 
+export const isSSRApp = (
+  project: WorkspaceProject
+) => !!project.architect?.build.options?.ssr;
+
 export const hasPrerenderOption = (
   project: WorkspaceProject
 ) => project.architect?.prerender;