@simondotm/nx-firebase 2.2.0 → 17.3.1

package/src/generators/application/schema.json

@@ -12,24 +12,29 @@
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What name would you like to use for the firebase node application?"
+      "x-prompt": "What name would you like to use for the firebase application?"
     },
     "directory": {
-      "description": "The directory of the new application.",
-      "type": "string"
+      "description": "A directory where the application is placed.",
+      "type": "string",
+      "alias": "d"
     },
     "tags": {
-      "description": "Add tags to the application (used for linting).",
-      "type": "string"
+      "type": "string",
+      "description": "Add tags to the project (used for linting)",
+      "alias": "t"
+    },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
     },
     "project": {
       "type": "string",
-      "description": "The firebase project that should be associated with this application",
+      "description": "The firebase CLI project that should be associated with this application",
       "default": ""
     }
   },
   "additionalProperties": false,
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }

package/src/generators/function/files/src/main.ts__tmpl__

@@ -10,13 +10,10 @@
 import {onRequest} from "firebase-functions/v2/https";
 import * as logger from "firebase-functions/logger";
 
-// import { initializeApp } from "firebase-admin/app";
-// initializeApp()
-
 // Start writing functions
 // https://firebase.google.com/docs/functions/typescript
 
-export const helloWorld = onRequest((request, response) => {
-  logger.info("Hello logs!", {structuredData: true});
-  response.send("Hello from Firebase!");
-});
+// export const helloWorld = onRequest((request, response) => {
+//   logger.info("Hello logs!", {structuredData: true});
+//   response.send("Hello from Firebase!");
+// });

package/src/generators/function/function.d.ts

@@ -1,14 +1,14 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
-import type { FunctionGeneratorOptions, NormalizedOptions } from './schema';
-export declare function normalizeOptions(tree: Tree, options: FunctionGeneratorOptions): NormalizedOptions;
+import type { Schema, NormalizedSchema } from './schema';
+export declare function normalizeOptions(host: Tree, options: Schema, callingGenerator?: string): Promise<NormalizedSchema>;
 /**
  * Firebase 'functions' application generator
  * Uses the `@nx/node` application generator as a base implementation
  *
- * @param tree
- * @param rawOptions
+ * @param host
+ * @param schema
  * @returns
  */
-export declare function functionGenerator(tree: Tree, rawOptions: FunctionGeneratorOptions): Promise<GeneratorCallback>;
+export declare function functionGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default functionGenerator;
-export declare const functionSchematic: (generatorOptions: FunctionGeneratorOptions) => (tree: any, context: any) => Promise<any>;
+export declare const functionSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/function/function.js

@@ -7,46 +7,83 @@ const node_1 = require("@nx/node");
 const init_1 = require("../init/init");
 const utils_1 = require("../../utils");
 const lib_1 = require("./lib");
-function normalizeOptions(tree, options) {
-    const { projectName, projectRoot } = (0, utils_1.getProjectName)(tree, options.name, options.directory);
-    // get & validate the firebase app project this function will be attached to
-    const firebaseApp = (0, devkit_1.names)(options.app).fileName;
-    const projects = (0, devkit_1.getProjects)(tree);
-    if (!projects.has(firebaseApp)) {
-        throw new Error(`A firebase application project called '${firebaseApp}' was not found in this workspace.`);
-    }
-    const firebaseAppProject = (0, devkit_1.readProjectConfiguration)(tree, firebaseApp);
-    // read the firebase config used by the parent app project
-    const firebaseConfigName = (0, utils_1.getFirebaseConfigFromProject)(tree, firebaseAppProject);
-    return Object.assign(Object.assign({}, options), { runTime: options.runTime || '16', format: options.format || 'esm', projectRoot,
-        projectName,
-        firebaseConfigName,
-        firebaseAppProject });
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const nx_firebase_versions_1 = require("../../__generated__/nx-firebase-versions");
+function normalizeOptions(host, options, callingGenerator = '@simondotm/nx-firebase:function') {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: appProjectName, projectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator,
+        });
+        options.rootProject = projectRoot === '.';
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        // const { projectName, projectRoot } = getProjectName(
+        //   host,
+        //   options.name,
+        //   options.directory,
+        // )
+        // get & validate the firebase app project this function will be attached to
+        const firebaseApp = (0, devkit_1.names)(options.app).fileName;
+        const projects = (0, devkit_1.getProjects)(host);
+        if (!projects.has(firebaseApp)) {
+            throw new Error(`A firebase application project called '${firebaseApp}' was not found in this workspace.`);
+        }
+        const firebaseAppProject = (0, devkit_1.readProjectConfiguration)(host, firebaseApp);
+        // read the firebase config used by the parent app project
+        const firebaseConfigName = (0, utils_1.getFirebaseConfigFromProject)(host, firebaseAppProject);
+        return Object.assign(Object.assign({}, options), { name: (0, devkit_1.names)(options.name).fileName, projectName: appProjectName, projectRoot,
+            parsedTags,
+            firebaseConfigName,
+            firebaseAppProject });
+        // return {
+        //   ...options,
+        //   runTime: options.runTime || '16',
+        //   format: options.format || 'esm',
+        //   projectRoot,
+        //   projectName,
+        //   firebaseConfigName,
+        //   firebaseAppProject,
+        // }
+    });
 }
 exports.normalizeOptions = normalizeOptions;
 /**
  * Firebase 'functions' application generator
  * Uses the `@nx/node` application generator as a base implementation
  *
- * @param tree
- * @param rawOptions
+ * @param host
+ * @param schema
  * @returns
  */
-function functionGenerator(tree, rawOptions) {
+function functionGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const tasks = [];
-        const options = normalizeOptions(tree, rawOptions);
+        const options = yield normalizeOptions(host, Object.assign({ 
+            // set default options
+            projectNameAndRootFormat: 'derived', runTime: nx_firebase_versions_1.packageVersions.nodeEngine }, schema));
+        if (!options.runTime) {
+            throw new Error('No runtime specified for the function app');
+        }
+        // const options = normalizeOptions(host, schema)
         // initialise plugin
-        const initTask = yield (0, init_1.initGenerator)(tree, {});
+        const initTask = yield (0, init_1.initGenerator)(host, {});
         tasks.push(initTask);
         // We use @nx/node:app to scaffold our function application, then modify as required
         // `nx g @nx/node:app function-name --directory functions/dir --e2eTestRunner=none --framework=none --unitTestRunner=jest --bundler=esbuild --tags=firebase:firebase-app`
         // Function apps are tagged so that they can built/watched with run-many
         const tags = `firebase:function,firebase:name:${options.projectName},firebase:dep:${options.firebaseAppProject.name}` +
             (options.tags ? `,${options.tags}` : '');
-        const nodeApplicationTask = yield (0, node_1.applicationGenerator)(tree, {
+        const nodeApplicationTask = yield (0, node_1.applicationGenerator)(host, {
             name: options.name,
             directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
             tags,
             setParserOptionsProject: options.setParserOptionsProject,
             skipFormat: options.skipFormat,
@@ -57,16 +94,16 @@ function functionGenerator(tree, rawOptions) {
         });
         tasks.push(nodeApplicationTask);
         // generate function app specific files
-        (0, lib_1.createFiles)(tree, options);
+        (0, lib_1.createFiles)(host, options);
         // update TS config for esm or cjs
-        (0, utils_1.updateTsConfig)(tree, options.projectRoot, options.runTime, options.format);
+        (0, utils_1.updateTsConfig)(host, options.projectRoot, options.runTime, options.format);
         // reconfigure the @nx/node:app to suit firebase functions
-        (0, lib_1.updateProject)(tree, options);
+        (0, lib_1.updateProject)(host, options);
         // update firebase functions config
-        (0, lib_1.addFunctionConfig)(tree, options);
+        (0, lib_1.addFunctionConfig)(host, options);
         // ensures newly added files are formatted to match workspace style
         if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
+            yield (0, devkit_1.formatFiles)(host);
         }
         return (0, devkit_1.runTasksInSerial)(...tasks);
     });

package/src/generators/function/function.js.map

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/function/function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/function/function.ts"],"names":[],"mappings":"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"}

package/src/generators/function/lib/add-function-config.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function addFunctionConfig(tree: Tree, options: NormalizedOptions): void;
+import type { NormalizedSchema } from '../schema';
+export declare function addFunctionConfig(host: Tree, options: NormalizedSchema): void;

package/src/generators/function/lib/add-function-config.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFunctionConfig = void 0;
 const devkit_1 = require("@nx/devkit");
-function addFunctionConfig(tree, options) {
-    (0, devkit_1.updateJson)(tree, options.firebaseConfigName, (json) => {
+function addFunctionConfig(host, options) {
+    (0, devkit_1.updateJson)(host, options.firebaseConfigName, (json) => {
         const functionConfig = {
             codebase: options.projectName,
             source: (0, devkit_1.joinPathFragments)('dist', options.projectRoot),

package/src/generators/function/lib/add-function-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-function-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/add-function-config.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAIhE,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAA0B;IACtE,IAAA,mBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,EAAE,CAAC,IAAoB,EAAE,EAAE;QACpE,MAAM,cAAc,GAAG;YACrB,QAAQ,EAAE,OAAO,CAAC,WAAW;YAC7B,MAAM,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC;YACtD,OAAO,EAAE,SAAS,OAAO,CAAC,OAAO,EAAE;YACnC,MAAM,EAAE,CAAC,SAAS,CAAC;SACpB,CAAA;QAED,kEAAkE;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAClC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC1D,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;YACnB,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE;gBACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;aACtC;SACF;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACnC,uCAAuC;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAmB,EAAE,CAAmB,EAAE,EAAE;YAC/D,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvE,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;AACJ,CAAC;AAxBD,8CAwBC"}
+{"version":3,"file":"add-function-config.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/add-function-config.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAIhE,SAAgB,iBAAiB,CAAC,IAAU,EAAE,OAAyB;IACrE,IAAA,mBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,EAAE,CAAC,IAAoB,EAAE,EAAE;QACpE,MAAM,cAAc,GAAG;YACrB,QAAQ,EAAE,OAAO,CAAC,WAAW;YAC7B,MAAM,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC;YACtD,OAAO,EAAE,SAAS,OAAO,CAAC,OAAO,EAAE;YACnC,MAAM,EAAE,CAAC,SAAS,CAAC;SACpB,CAAA;QAED,kEAAkE;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAClC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC1D,IAAI,CAAC,SAAS,GAAG,EAAE,CAAA;YACnB,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,EAAE;gBACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;aACtC;SACF;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACnC,uCAAuC;QACvC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAmB,EAAE,CAAmB,EAAE,EAAE;YAC/D,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvE,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;AACJ,CAAC;AAxBD,8CAwBC"}

package/src/generators/function/lib/create-files.d.ts

@@ -1,9 +1,9 @@
 import { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
+import type { NormalizedSchema } from '../schema';
 /**
  * Generate the firebase app specific files
  *
- * @param tree
+ * @param host
  * @param options
  */
-export declare function createFiles(tree: Tree, options: NormalizedOptions): void;
+export declare function createFiles(host: Tree, options: NormalizedSchema): void;

package/src/generators/function/lib/create-files.js

@@ -2,16 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
+const nx_firebase_versions_1 = require("../../../__generated__/nx-firebase-versions");
 /**
  * Generate the firebase app specific files
  *
- * @param tree
+ * @param host
  * @param options
  */
-function createFiles(tree, options) {
+function createFiles(host, options) {
     const firebaseAppConfig = options.firebaseConfigName;
-    const firebaseAppConfigPath = (0, devkit_2.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), firebaseAppConfig);
+    const firebaseAppConfigPath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.projectRoot), firebaseAppConfig);
     const substitutions = {
         tmpl: '',
         projectName: options.projectName,
@@ -31,7 +31,18 @@ function createFiles(tree, options) {
     // Rules and index files also get generated in the application folder;
     // 1. so that they dont clutter up the root workspace
     // 2. so that they are located within the nx firebase application project they relate to
-    (0, devkit_2.generateFiles)(tree, (0, devkit_2.joinPathFragments)(__dirname, '..', 'files'), options.projectRoot, substitutions);
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files'), options.projectRoot, substitutions);
+    // set dependencies for the firebase function
+    const firebasePackageDependencies = {};
+    if ((0, devkit_1.detectPackageManager)() === 'pnpm') {
+        firebasePackageDependencies['@google-cloud/functions-framework'] = `^${nx_firebase_versions_1.packageVersions.googleCloudFunctionsFramework}`;
+    }
+    if (Object.keys(firebasePackageDependencies).length > 0) {
+        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+            json.dependencies = firebasePackageDependencies;
+            return json;
+        });
+    }
 }
 exports.createFiles = createFiles;
 //# sourceMappingURL=create-files.js.map

package/src/generators/function/lib/create-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/create-files.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,uCAA6D;AAG7D;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAA;IACpD,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,iBAAiB,CAClB,CAAA;IAED,MAAM,aAAa,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW;QAEhC,eAAe,EAAE,OAAO,CAAC,GAAG;QAC5B,iBAAiB;QACjB,qBAAqB;QAErB,kBAAkB,EAAE,OAAO,CAAC,OAAO;QAEnC,uBAAuB;QACvB,sBAAsB;QAEtB,UAAU,EAAE,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;KAC7D,CAAA;IAED,wFAAwF;IACxF,yCAAyC;IACzC,uGAAuG;IACvG,EAAE;IACF,sEAAsE;IACtE,qDAAqD;IACrD,wFAAwF;IACxF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAA;AACH,CAAC;AArCD,kCAqCC"}
+{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/create-files.ts"],"names":[],"mappings":";;;AAAA,uCAOmB;AAEnB,sFAA6E;AAE7E;;;;;GAKG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,MAAM,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAA;IACpD,MAAM,qBAAqB,GAAG,IAAA,0BAAiB,EAC7C,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnC,iBAAiB,CAClB,CAAA;IAED,MAAM,aAAa,GAAG;QACpB,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW;QAEhC,eAAe,EAAE,OAAO,CAAC,GAAG;QAC5B,iBAAiB;QACjB,qBAAqB;QAErB,kBAAkB,EAAE,OAAO,CAAC,OAAO;QAEnC,uBAAuB;QACvB,sBAAsB;QAEtB,UAAU,EAAE,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU;KAC7D,CAAA;IAED,wFAAwF;IACxF,yCAAyC;IACzC,uGAAuG;IACvG,EAAE;IACF,sEAAsE;IACtE,qDAAqD;IACrD,wFAAwF;IACxF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,EAC3C,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAA;IAED,6CAA6C;IAC7C,MAAM,2BAA2B,GAAG,EAAE,CAAA;IACtC,IAAI,IAAA,6BAAoB,GAAE,KAAK,MAAM,EAAE;QACrC,2BAA2B,CACzB,mCAAmC,CACpC,GAAG,IAAI,sCAAe,CAAC,6BAA6B,EAAE,CAAA;KACxD;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QACvD,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EACtD,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,CAAC,YAAY,GAAG,2BAA2B,CAAA;YAC/C,OAAO,IAAI,CAAA;QACb,CAAC,CACF,CAAA;KACF;AACH,CAAC;AAxDD,kCAwDC"}

package/src/generators/function/lib/delete-files.d.ts

@@ -1,8 +1,8 @@
-import type { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
+import { type Tree } from '@nx/devkit';
+import type { NormalizedSchema } from '../schema';
 /**
  * Delete unwanted files created by the node generator
- * @param tree
+ * @param host
  * @param options
  */
-export declare function deleteFiles(tree: Tree, options: NormalizedOptions): void;
+export declare function deleteFiles(host: Tree, options: NormalizedSchema): void;

package/src/generators/function/lib/delete-files.js

@@ -4,10 +4,10 @@ exports.deleteFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 /**
  * Delete unwanted files created by the node generator
- * @param tree
+ * @param host
  * @param options
  */
-function deleteFiles(tree, options) {
+function deleteFiles(host, options) {
     const nodeFilesToDelete = [
         (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'main.ts'),
         (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'app', '.gitkeep'),
@@ -16,7 +16,7 @@ function deleteFiles(tree, options) {
         (0, devkit_1.joinPathFragments)(options.projectRoot, 'src', 'environments', 'environment.ts'),
     ];
     for (const path of nodeFilesToDelete) {
-        tree.delete(path);
+        host.delete(path);
     }
 }
 exports.deleteFiles = deleteFiles;

package/src/generators/function/lib/delete-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/delete-files.ts"],"names":[],"mappings":";;;AACA,uCAA8C;AAG9C;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,iBAAiB,GAAG;QACxB,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC;QACxD,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC;QAChE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC;QACnE,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,cAAc,EACd,qBAAqB,CACtB;QACD,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,cAAc,EACd,gBAAgB,CACjB;KACF,CAAA;IAED,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE;QACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;KAClB;AACH,CAAC;AAtBD,kCAsBC"}
+{"version":3,"file":"delete-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/delete-files.ts"],"names":[],"mappings":";;;AAAA,uCAAyD;AAGzD;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;IAC/D,MAAM,iBAAiB,GAAG;QACxB,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,SAAS,CAAC;QACxD,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC;QAChE,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC;QACnE,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,cAAc,EACd,qBAAqB,CACtB;QACD,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,cAAc,EACd,gBAAgB,CACjB;KACF,CAAA;IAED,KAAK,MAAM,IAAI,IAAI,iBAAiB,EAAE;QACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;KAClB;AACH,CAAC;AAtBD,kCAsBC"}

package/src/generators/function/lib/update-project.d.ts

@@ -1,3 +1,3 @@
 import { Tree } from '@nx/devkit';
-import type { NormalizedOptions } from '../schema';
-export declare function updateProject(tree: Tree, options: NormalizedOptions): void;
+import type { NormalizedSchema } from '../schema';
+export declare function updateProject(host: Tree, options: NormalizedSchema): void;

package/src/generators/function/lib/update-project.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProject = void 0;
 const devkit_1 = require("@nx/devkit");
-function updateProject(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
+function updateProject(host, options) {
+    var _a;
+    const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     const firebaseAppProject = options.firebaseAppProject;
     // replace the default node build target with a simplified version
     // we dont need dev/production build configurations for firebase functions since its a confined secure environment
@@ -21,7 +22,7 @@ function updateProject(tree, options) {
             bundle: true,
             thirdParty: false,
             dependenciesFieldType: 'dependencies',
-            target: 'node16',
+            target: `node${options.runTime}`,
             format: [options.format || 'esm'],
             esbuildOptions: {
                 logLevel: 'info',
@@ -51,12 +52,17 @@ function updateProject(tree, options) {
     // No serve target for functions, since we may have multiple functions in a firebase project
     // Instead we serve at the firebase app project
     delete project.targets.serve;
-    (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
+    // Nx 17+ no longer includes passWithNoTests in the test target by default
+    // Add it so that functions without tests don't fail when running the app's test target
+    if ((_a = project.targets.test) === null || _a === void 0 ? void 0 : _a.options) {
+        project.targets.test.options.passWithNoTests = true;
+    }
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     // Add function project as implicit dep of firebase app project
     firebaseAppProject.implicitDependencies || (firebaseAppProject.implicitDependencies = []);
     firebaseAppProject.implicitDependencies.push(options.projectName);
     firebaseAppProject.implicitDependencies.sort();
-    (0, devkit_1.updateProjectConfiguration)(tree, options.app, firebaseAppProject);
+    (0, devkit_1.updateProjectConfiguration)(host, options.app, firebaseAppProject);
 }
 exports.updateProject = updateProject;
 //# sourceMappingURL=update-project.js.map

package/src/generators/function/lib/update-project.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/update-project.ts"],"names":[],"mappings":";;;AAAA,uCAImB;AAInB,SAAgB,aAAa,CAAC,IAAU,EAAE,OAA0B;IAClE,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAEnE,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;IAErD,kEAAkE;IAClE,kHAAkH;IAClH,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG;QACtB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU;YACpD,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI;YACxC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ;YAChD,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM;YAC5C,mBAAmB,EAAE,IAAI;YACzB,gEAAgE;YAChE,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,KAAK;YACjB,qBAAqB,EAAE,cAAc;YACrC,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;YACjC,cAAc,EAAE;gBACd,QAAQ,EAAE,MAAM;aACjB;SACF;KACF,CAAA;IAED,mDAAmD;IACnD,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAA;IAC/C,MAAM,MAAM,GAA0B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAA;IAC1E,MAAM,IAAI,GAAuB;QAC/B,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,GAAG,eAAe,cAAc;QACvC,MAAM,EAAE,GAAG;KACZ,CAAA;IACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEjB,oBAAoB;IACpB,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG;QACvB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;YACP,2EAA2E;YAC3E,oGAAoG;YACpG,OAAO,EAAE,UAAU,kBAAkB,CAAC,IAAI,4BAA4B,OAAO,CAAC,WAAW,EAAE;SAC5F;QACD,SAAS,EAAE,CAAC,OAAO,CAAC;KACrB,CAAA;IAED,uCAAuC;IACvC,4FAA4F;IAC5F,+CAA+C;IAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAA;IAE5B,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAE9D,+DAA+D;IAC/D,kBAAkB,CAAC,oBAAoB,KAAvC,kBAAkB,CAAC,oBAAoB,GAAK,EAAE,EAAA;IAC9C,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACjE,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAA;IAC9C,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;AACnE,CAAC;AA9DD,sCA8DC"}
+{"version":3,"file":"update-project.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/function/lib/update-project.ts"],"names":[],"mappings":";;;AAAA,uCAImB;AAInB,SAAgB,aAAa,CAAC,IAAU,EAAE,OAAyB;;IACjE,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAEnE,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAA;IAErD,kEAAkE;IAClE,kHAAkH;IAClH,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG;QACtB,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU;YACpD,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI;YACxC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ;YAChD,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM;YAC5C,mBAAmB,EAAE,IAAI;YACzB,gEAAgE;YAChE,QAAQ,EAAE,MAAM;YAChB,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,KAAK;YACjB,qBAAqB,EAAE,cAAc;YACrC,MAAM,EAAE,OAAO,OAAO,CAAC,OAAO,EAAE;YAChC,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;YACjC,cAAc,EAAE;gBACd,QAAQ,EAAE,MAAM;aACjB;SACF;KACF,CAAA;IAED,mDAAmD;IACnD,MAAM,eAAe,GAAG,kBAAkB,CAAC,IAAI,CAAA;IAC/C,MAAM,MAAM,GAA0B,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAA;IAC1E,MAAM,IAAI,GAAuB;QAC/B,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,GAAG,eAAe,cAAc;QACvC,MAAM,EAAE,GAAG;KACZ,CAAA;IACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEjB,oBAAoB;IACpB,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG;QACvB,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;YACP,2EAA2E;YAC3E,oGAAoG;YACpG,OAAO,EAAE,UAAU,kBAAkB,CAAC,IAAI,4BAA4B,OAAO,CAAC,WAAW,EAAE;SAC5F;QACD,SAAS,EAAE,CAAC,OAAO,CAAC;KACrB,CAAA;IAED,uCAAuC;IACvC,4FAA4F;IAC5F,+CAA+C;IAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAA;IAE5B,0EAA0E;IAC1E,uFAAuF;IACvF,IAAI,MAAA,OAAO,CAAC,OAAO,CAAC,IAAI,0CAAE,OAAO,EAAE;QACjC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,IAAI,CAAA;KACpD;IAED,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAE9D,+DAA+D;IAC/D,kBAAkB,CAAC,oBAAoB,KAAvC,kBAAkB,CAAC,oBAAoB,GAAK,EAAE,EAAA;IAC9C,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACjE,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAA;IAC9C,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;AACnE,CAAC;AApED,sCAoEC"}

package/src/generators/function/schema.d.ts

@@ -1,4 +1,5 @@
 import { ProjectConfiguration } from '@nx/devkit'
+import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils'
 
 // export interface Schema {
 //   name: string;
@@ -23,29 +24,32 @@ import { ProjectConfiguration } from '@nx/devkit'
 //   isNest?: boolean;
 // }
 
-// subset of @nx/node:application options that we forward to node app generator
-interface SupportedNodeGeneratorOptions {
+export interface Schema {
+  // standard nx generator options
+  name: string
+  directory?: string
+  tags?: string
+  projectNameAndRootFormat?: ProjectNameAndRootFormat
+  rootProject?: boolean
+
+  // subset of @nx/node:application options that we forward to node app generator
   setParserOptionsProject?: boolean
   skipFormat?: boolean
   // unitTestRunner is always jest
   // bundler is always esbuild
   // linter is always eslint
-}
-
-export interface FunctionGeneratorOptions
-  extends SupportedNodeGeneratorOptions {
-  name: string
-  directory?: string
-  tags?: string
 
+  // nx-firebase:function generator specific options
   app: string
   runTime?: '16' | '18' | '20'
   format?: 'esm' | 'cjs'
 }
 
-interface NormalizedOptions extends FunctionGeneratorOptions {
-  projectRoot: Path
+interface NormalizedSchema extends Schema {
   projectName: string
+  projectRoot: string
+  parsedTags: string[]
+
   firebaseConfigName: string
   firebaseAppProject: ProjectConfiguration
 }

package/src/generators/function/schema.json

@@ -16,12 +16,19 @@
       "x-prompt": "What name would you like to use for the firebase function project?"
     },
     "directory": {
-      "description": "The directory of the new function project.",
-      "type": "string"
+      "description": "A directory where the function is placed.",
+      "type": "string",
+      "alias": "d"
     },
     "tags": {
-      "description": "Add tags to the application (used for linting).",
-      "type": "string"
+      "type": "string",
+      "description": "Add tags to the project (used for linting)",
+      "alias": "t"
+    },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
     },
     "setParserOptionsProject": {
       "type": "boolean",
@@ -43,14 +50,13 @@
       "description": "The name of the parent Nx firebase application project this function will be added to.",
       "type": "string",
       "x-prompt": "Which firebase Nx application project will this function be created for?"
-    },       
+    },
     "runTime": {
       "description": "The node runtime target for this function.",
       "type": "string",
-      "enum": ["16", "18", "20"],
-      "default": "16"
+      "enum": ["18", "20", "22"],
+      "default": "18"
     }
-
   },
   "additionalProperties": false,
   "required": ["name", "app"]

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
 import type { InitGeneratorOptions } from './schema';
 /**
  * `nx g @simondotm/nx-firebase:init`
@@ -7,5 +7,5 @@ import type { InitGeneratorOptions } from './schema';
  * It also adds `@nx/node` if it is not already installed
  *
  */
-export declare function initGenerator(tree: Tree, options: InitGeneratorOptions): Promise<GeneratorCallback>;
+export declare function initGenerator(host: Tree, schema: InitGeneratorOptions): Promise<GeneratorCallback>;
 export default initGenerator;

package/src/generators/init/init.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initGenerator = void 0;
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 /**
@@ -11,11 +12,16 @@ const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
  * It also adds `@nx/node` if it is not already installed
  *
  */
-function initGenerator(tree, options) {
+function initGenerator(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, add_git_ignore_entry_1.addGitIgnore)(tree);
-        (0, add_git_ignore_entry_1.addNxIgnore)(tree);
-        return (0, lib_1.addDependencies)(tree);
+        const tasks = [];
+        (0, add_git_ignore_entry_1.addGitIgnore)(host);
+        (0, add_git_ignore_entry_1.addNxIgnore)(host);
+        if (!schema.skipFormat) {
+            yield (0, devkit_1.formatFiles)(host);
+        }
+        tasks.push((0, lib_1.addDependencies)(host));
+        return (0, devkit_1.runTasksInSerial)(...tasks);
     });
 }
 exports.initGenerator = initGenerator;

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/init/init.ts"],"names":[],"mappings":";;;;AACA,+BAAuC;AACvC,qEAAsE;AAGtE;;;;;;GAMG;AACH,SAAsB,aAAa,CACjC,IAAU,EACV,OAA6B;;QAE7B,IAAA,mCAAY,EAAC,IAAI,CAAC,CAAA;QAClB,IAAA,kCAAW,EAAC,IAAI,CAAC,CAAA;QACjB,OAAO,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;CAAA;AAPD,sCAOC;AAED,kBAAe,aAAa,CAAA"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAKmB;AACnB,+BAAuC;AACvC,qEAAsE;AAGtE;;;;;;GAMG;AACH,SAAsB,aAAa,CACjC,IAAU,EACV,MAA4B;;QAE5B,MAAM,KAAK,GAAwB,EAAE,CAAA;QACrC,IAAA,mCAAY,EAAC,IAAI,CAAC,CAAA;QAClB,IAAA,kCAAW,EAAC,IAAI,CAAC,CAAA;QACjB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;SACxB;QACD,KAAK,CAAC,IAAI,CAAC,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAC,CAAA;QACjC,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAA;IACnC,CAAC;CAAA;AAZD,sCAYC;AAED,kBAAe,aAAa,CAAA"}

package/src/generators/init/lib/add-dependencies.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = void 0;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../../../utils");
-const versions_1 = require("../../../utils/versions");
+const nx_firebase_versions_1 = require("../../../__generated__/nx-firebase-versions");
 function addDependencies(tree) {
     const dependencies = {};
     const devDependencies = {};
@@ -15,26 +15,35 @@ function addDependencies(tree) {
     function addDependencyIfNotPresent(packageName, packageVersion) {
         if (!packageJson.dependencies || !packageJson.dependencies[packageName]) {
             dependencies[packageName] = packageVersion;
+            return true;
         }
+        return false;
     }
     function addDevDependencyIfNotPresent(packageName, packageVersion) {
         if (!packageJson.devDependencies ||
             !packageJson.devDependencies[packageName]) {
             devDependencies[packageName] = packageVersion;
+            return true;
+        }
+        return false;
+    }
+    // Firebase packages are not managed by the plugin
+    // but they are added if they do not exist already in the workspace
+    addDependencyIfNotPresent('firebase', `^${nx_firebase_versions_1.packageVersions.firebase}`);
+    addDependencyIfNotPresent('firebase-admin', `^${nx_firebase_versions_1.packageVersions.firebaseAdmin}`);
+    addDependencyIfNotPresent('firebase-functions', `^${nx_firebase_versions_1.packageVersions.firebaseFunctions}`);
+    // if the workspace uses pnpm, we need to add the @google-cloud/functions-framework package
+    if ((0, devkit_1.detectPackageManager)() === 'pnpm') {
+        if (addDependencyIfNotPresent('@google-cloud/functions-framework', `^${nx_firebase_versions_1.packageVersions.googleCloudFunctionsFramework}`)) {
+            devkit_1.logger.info(`This workspace is using pnpm, adding '@google-cloud/functions-framework' dependency for firebase functions compatibility\nSee https://github.com/firebase/firebase-tools/issues/5911#issuecomment-1730263400\n\n`);
         }
     }
-    // firebase dependencies
-    addDependencyIfNotPresent('firebase', versions_1.firebaseVersion);
-    addDependencyIfNotPresent('firebase-admin', versions_1.firebaseAdminVersion);
-    addDependencyIfNotPresent('firebase-functions', versions_1.firebaseFunctionsVersion);
-    //SM: not convinced we should be adding tslib in this plugin
-    //addDependencyIfNotPresent('tslib', tsLibVersion)
     // firebase dev dependencies
-    addDevDependencyIfNotPresent('firebase-tools', versions_1.firebaseToolsVersion);
-    addDevDependencyIfNotPresent('firebase-functions-test', versions_1.firebaseFunctionsTestVersion);
+    addDevDependencyIfNotPresent('firebase-tools', `^${nx_firebase_versions_1.packageVersions.firebaseTools}`);
+    addDevDependencyIfNotPresent('firebase-functions-test', `^${nx_firebase_versions_1.packageVersions.firebaseFunctionsTest}`);
     // kill-port is used by the emulate target to ensure clean emulator startup
     // since Nx doesn't kill processes cleanly atm
-    addDevDependencyIfNotPresent('kill-port', versions_1.killportVersion);
+    addDevDependencyIfNotPresent('kill-port', `^${nx_firebase_versions_1.packageVersions.killPort}`);
     // @nx/node is used by the plugin function generator as a proxy for creating a typescript app
     // since users have to create a firebase app before they generate a function, we can be sure
     // this plugin init will have been run before the function generator that requires @nx/node is used