@angular/fire 16.0.0-canary.e04cd7f → 16.0.0-rc.0

package/schematics/deploy/schema.json

@@ -0,0 +1,119 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "FirebaseDeploySchema",
+  "title": "Firebase Deploy",
+  "description": "Ng Deploy target options for Firebase.",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "browserTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "prerenderTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "serverTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "universalBuildTarget": {
+      "type": "string",
+      "description": "Target to build.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    },
+    "ssr": {
+      "oneOf": [{ "type": "boolean" }, { "type": "string" }],
+      "description": "Should we attempt to deploy the function to Cloud Functions (true or 'cloud-functions') / Cloud Run ('cloud-run') or just Hosting (false)"
+    },
+    "prerender": {
+      "type": "boolean",
+      "description": "Prerender before deploy?"
+    },
+    "firebaseProject": {
+      "type": "string",
+      "description": "The Firebase project name or project alias to use when deploying"
+    },
+    "target": {
+      "type": "string",
+      "description": "The Firebase hosting target in firebase.json for multi-site"
+    },
+    "firebaseHostingSite": {
+      "type": "string",
+      "description": "The Firebase Hosting site to deploy to"
+    },
+    "functionName": {
+      "type": "string",
+      "description": "The name of the Cloud Function or Cloud Run serviceId to deploy SSR to"
+    },
+    "functionsNodeVersion": {
+      "oneOf": [{ "type": "number" }, { "type": "string" }],
+      "description": "Version of Node.js to run Cloud Functions / Run on"
+    },
+    "CF3v2": {
+      "type": "boolean",
+      "description": "Generation of the Functions product to run on"
+    },
+    "region": {
+      "type": "string",
+      "description": "The region to deploy Cloud Functions or Cloud Run to"
+    },
+    "outputPath": {
+      "type": "string",
+      "description": "Where to output the deploy artifacts"
+    },
+    "functionsRuntimeOptions": {
+      "type": "object",
+      "description": "Runtime options for Cloud Functions, if deploying to Cloud Functions"
+    },
+    "preview": {
+      "type": "boolean",
+      "description": "Do not deploy the application, just set up the Firebase Function in the project output directory. Can be used for testing the Firebase Function with `firebase serve`."
+    },
+    "cloudRunOptions": {
+      "type": "object",
+      "description": "Options passed to Cloud Run, if deploying to Cloud Run.",
+      "properties": {
+        "cpus": {
+          "type": "number",
+          "description": "Set a CPU limit in Kubernetes cpu units."
+        },
+        "maxConcurrency": {
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
+          "pattern": "^(\\d+|default)$",
+          "description": "Set the maximum number of concurrent requests allowed per container instance. If concurrency is unspecified, any number of concurrent requests are allowed. To unset this field, provide the special value default."
+        },
+        "maxInstances": {
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
+          "pattern": "^(\\d+|default)$",
+          "description": "The maximum number of container instances of the Service to run. Use 'default' to unset the limit and use the platform default."
+        },
+        "memory": {
+          "type": "string",
+          "pattern": "^\\d+(G|M)i$",
+          "description": "Set a memory limit. Ex: 1Gi, 512Mi."
+        },
+        "minInstances": {
+          "oneOf": [{ "type": "number" }, { "type": "string" }],
+          "pattern": "^(\\d+|default)$",
+          "description": "The minimum number of container instances of the Service to run or 'default' to remove any minimum."
+        },
+        "timeout": {
+          "type": "number",
+          "description": "Set the maximum request execution time (timeout) in seconds."
+        },
+        "vpcConnector": {
+          "type": "string",
+          "description": "Set a VPC connector for this resource."
+        }
+      }
+    }
+  }
+}

package/schematics/migration.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
+    "schematics": {
+        "migration-v7": {
+            "version": "7.0.0",
+            "description": "Update @angular/fire to v7",
+            "factory": "./update/v7#ngUpdate"
+        },
+        "ng-post-upgate": {
+            "description": "Print out results after ng-update",
+            "factory": "./update#ngPostUpdate",
+            "private": true
+        }
+    }
+}

package/schematics/setup/index.js

@@ -10,15 +10,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupFirebase = exports.generateFirebaseJson = exports.ngAddSetupProject = exports.setupProject = void 0;
+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 common_1 = require("../common");
+const firebaseTools_1 = require("../firebaseTools");
 const utils_1 = require("../utils");
 const prompts_1 = require("./prompts");
-const firebaseTools_1 = require("../firebaseTools");
-const fs_1 = require("fs");
-const path_1 = require("path");
-const common_1 = require("../common");
-;
 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);
@@ -28,7 +27,7 @@ const setupProject = (tree, context, features, config) => __awaiter(void 0, void
     const featuresToImport = features.filter(it => it !== 0);
     if (featuresToImport.length > 0) {
         (0, utils_1.addToNgModule)(tree, { features: featuresToImport, sourcePath });
-        (0, utils_1.addFixesToServer)(tree, { features: featuresToImport, sourcePath });
+        (0, utils_1.addFixesToServer)(tree);
     }
     if (config.sdkConfig) {
         const source = `

package/schematics/setup/prompts.js

@@ -35,10 +35,10 @@ 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 fuzzy = __importStar(require("fuzzy"));
 const inquirer = __importStar(require("inquirer"));
+const common_1 = require("../common");
+const firebaseTools_1 = require("../firebaseTools");
 const interfaces_1 = require("../interfaces");
 const utils_1 = require("../utils");
-const firebaseTools_1 = require("../firebaseTools");
-const common_1 = require("../common");
 inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
 const NEW_OPTION = '~~angularfire-new~~';
 const DEFAULT_SITE_TYPE = 'DEFAULT_SITE';
@@ -190,7 +190,7 @@ const projectPrompt = (defaultProject, options) => __awaiter(void 0, void 0, voi
         });
         return yield firebaseTools.projects.create(projectId, { account: options.account, displayName, nonInteractive: true });
     }
-    return (yield projects).find(it => it.projectId === projectId);
+    return (projects).find(it => it.projectId === projectId);
 });
 exports.projectPrompt = projectPrompt;
 const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -209,10 +209,9 @@ const appPrompt = ({ projectId: project }, defaultAppId, options) => __awaiter(v
             name: 'displayName',
             message: 'What would you like to call your app?',
         });
-        ;
         return yield firebaseTools.apps.create('web', displayName, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
-    return (yield apps).find(it => (0, utils_1.shortAppId)(it) === appId);
+    return (apps).find(it => (0, utils_1.shortAppId)(it) === appId);
 });
 exports.appPrompt = appPrompt;
 const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -245,7 +244,7 @@ const sitePrompt = ({ projectId: project }, options) => __awaiter(void 0, void 0
         });
         return yield firebaseTools.hosting.sites.create(subdomain, Object.assign(Object.assign({}, options), { nonInteractive: true, project }));
     }
-    return (yield sites).find(it => (0, common_1.shortSiteName)(it) === siteName);
+    return (sites).find(it => (0, common_1.shortSiteName)(it) === siteName);
 });
 exports.sitePrompt = sitePrompt;
 const DEFAULT_REGION = 'us-central1';

package/schematics/setup/schema.json

@@ -0,0 +1,16 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema",
+    "$id": "angular-fire-ng-add",
+    "title": "AngularFire ng-add",
+    "type": "object",
+    "properties": {
+      "project": {
+        "type": "string",
+        "description": "The name of the project.",
+        "$default": {
+          "$source": "projectName"
+        }
+      }
+    },
+    "required": []
+  }

package/schematics/update/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngPostUpdate = void 0;
-const ngPostUpdate = () => (host, context) => {
+const ngPostUpdate = () => (host, _context) => {
     return host;
 };
 exports.ngPostUpdate = ngPostUpdate;

package/schematics/update/v7/index.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngUpdate = void 0;
+const path_1 = require("path");
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const common_1 = require("../../common");
 const versions_json_1 = require("../../versions.json");
-const path_1 = require("path");
-const IMPORT_REGEX = /(?<key>import|export)\s+(?:(?<alias>[\w,{}\s\*]+)\s+from)?\s*(?:(?<quote>["'])?(?<ref>[@\w\s\\\/.-]+)\3?)\s*(?<term>[;\n])/g;
+const IMPORT_REGEX = /(?<key>import|export)\s+(?:(?<alias>[\w,{}\s*]+)\s+from)?\s*(?:(?<quote>["'])?(?<ref>[@\w\s\\/.-]+)\3?)\s*(?<term>[;\n])/g;
 const ngUpdate = () => (host, context) => {
     const packageJson = host.exists('package.json') && (0, common_1.safeReadJSON)('package.json', host);
     if (packageJson === undefined) {

package/schematics/utils.js

@@ -16,7 +16,7 @@ const isUniversalApp = (project) => { var _a; return (_a = project.architect) ==
 exports.isUniversalApp = isUniversalApp;
 const hasPrerenderOption = (project) => { var _a; return (_a = project.architect) === null || _a === void 0 ? void 0 : _a.prerender; };
 exports.hasPrerenderOption = hasPrerenderOption;
-const shortAppId = (app) => (app === null || app === void 0 ? void 0 : app.appId) && app.appId.split('/').pop();
+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(); };
 exports.shortAppId = shortAppId;
 function getWorkspace(host) {
     const path = '/angular.json';
@@ -88,7 +88,7 @@ function addEnvironmentEntry(host, filePath, data) {
         }
         const sourceFile = typescript_1.default.createSourceFile(filePath, buffer.toString('utf-8'), typescript_1.default.ScriptTarget.Latest, true);
         const envIdentifier = (0, ast_utils_1.findNode)(sourceFile, typescript_1.default.SyntaxKind.Identifier, 'environment');
-        if (!envIdentifier || !envIdentifier.parent) {
+        if (!(envIdentifier === null || envIdentifier === void 0 ? void 0 : envIdentifier.parent)) {
             throw new schematics_1.SchematicsException(`Cannot find 'environment' identifier in ${filePath}`);
         }
         const envObjectLiteral = envIdentifier.parent.getChildren().find(({ kind }) => kind === typescript_1.default.SyntaxKind.ObjectLiteralExpression);
@@ -97,7 +97,7 @@ function addEnvironmentEntry(host, filePath, data) {
         }
         const firebaseIdentifier = (0, ast_utils_1.findNode)(envObjectLiteral, typescript_1.default.SyntaxKind.Identifier, 'firebase');
         const recorder = host.beginUpdate(filePath);
-        if (firebaseIdentifier && firebaseIdentifier.parent) {
+        if (firebaseIdentifier === null || firebaseIdentifier === void 0 ? void 0 : firebaseIdentifier.parent) {
             const change = new change_1.ReplaceChange(filePath, firebaseIdentifier.parent.pos, firebaseIdentifier.parent.getFullText(), data);
             (0, change_1.applyToUpdateRecorder)(recorder, [change]);
         }
@@ -120,7 +120,7 @@ function addEnvironmentEntry(host, filePath, data) {
     return host;
 }
 exports.addEnvironmentEntry = addEnvironmentEntry;
-function addFixesToServer(host, options) {
+function addFixesToServer(host) {
     const serverPath = `/server.ts`;
     if (!host.exists(serverPath)) {
         return host;

package/storage/storage.module.d.ts

@@ -1,7 +1,7 @@
-import { NgZone, InjectionToken, ModuleWithProviders, Injector } from '@angular/core';
+import { InjectionToken, Injector, ModuleWithProviders, NgZone } from '@angular/core';
+import { FirebaseApp } from '@angular/fire/app';
 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;

package/publish.sh

@@ -1 +0,0 @@
-npm publish . --tag canary