Merge branch 'main' into fix/schematic-firebase-options-allowlist

Author: armando-navarro

src/package.json

@@ -29,7 +29,7 @@
     "@angular/platform-browser-dynamic": "^21.0.0",
     "@angular/platform-server": "^21.0.0",
     "rxjs": "~7.8.0",
-    "firebase-tools": "^14.0.0"
+    "firebase-tools": "^14.0.0 || ^15.0.0"
   },
   "peerDependenciesMeta": {
     "firebase-tools": { "optional": true },

src/schematics/firebaseTools.ts

@@ -8,6 +8,9 @@ declare global {
     var firebaseTools: FirebaseTools|undefined;
 }
 
+// The minimum firebase-tools version the schematics require.
+const minFirebaseToolsVersion = '14.0.0';
+
 export const getFirebaseTools = () => globalThis.firebaseTools ?
     Promise.resolve(globalThis.firebaseTools) :
     new Promise<FirebaseTools>((resolve, reject) => {
@@ -44,8 +47,8 @@ export const getFirebaseTools = () => globalThis.firebaseTools ?
         globalThis.firebaseTools = firebaseTools;
         const version = firebaseTools.cli.version();
         console.log(`Using firebase-tools version ${version}`);
-        if (semverCompare(version, '14.0.0') === -1) {
-            console.error('firebase-tools version 14.0.0+ is required, please upgrade and run again');
+        if (semverCompare(version, minFirebaseToolsVersion) === -1) {
+            console.error(`firebase-tools version ${minFirebaseToolsVersion}+ is required, please upgrade and run again`);
             return Promise.reject();
         }
         return firebaseTools;

src/schematics/utils.ts

@@ -375,7 +375,7 @@ export function parseDataConnectConfig(
       package: connectorJson.generate.javascriptSdk.package,
       angular: connectorJson.generate.javascriptSdk.angular,
     };
-  } catch (_) {
+  } catch (e) {
     console.error("Couldn't parse dataconnect.yaml", e);
     return null;
   }

tsconfig.base.json

@@ -18,7 +18,7 @@
         "node_modules/@types"
       ],
       "lib": [
-        "es2018",
+        "es2022",
         "dom"
       ],
       "paths": {

tsconfig.build.json

@@ -5,7 +5,7 @@
     "compilerOptions": {
         "outDir": "tools",
         "skipLibCheck": true,
-        "lib": ["es2019", "dom"],
+        "lib": ["es2022", "dom"],
         "module": "commonjs",
         "target": "ES2020",
         "plugins": [

tsconfig.json

@@ -11,7 +11,7 @@
     ],
     "lib": [
       "dom",
-      "es2018"
+      "es2022"
     ]
   },
   "angularCompilerOptions": {