@simondotm/nx-firebase 1.0.0 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simondotm/nx-firebase",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "A Firebase plugin for Nx monorepo workspaces.",
   "author": "Simon Morris",
   "license": "MIT",
@@ -21,8 +21,11 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "nx": ">= 13.10.6",
-    "@nrwl/workspace": ">= 13.10.6"
+    "@nx/workspace": ">= 13.10.6",
+    "nx": ">= 13.10.6"
   },
-  "typings": "./src/index.d.ts"
+  "dependencies": {
+    "fs-extra": "11.1.1"
+  },
+  "types": "./src/index.d.ts"
 }

package/src/executors/build/build.d.ts

@@ -1,12 +1,8 @@
-import '../../utils/e2ePatch';
-import { ExecutorContext } from '@nrwl/devkit';
-import type { ExecutorOptions } from '@nrwl/js/src/utils/schema';
+import { ExecutorContext } from '@nx/devkit';
+import type { ExecutorOptions } from '@nx/js/src/utils/schema';
 /**
  * @simondotm/nx-firebase:build executor is a
- *  customized version of @nrwl/js:tsc executor
+ *  customized version of @nx/js:tsc executor
  */
-export declare function runExecutor(options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<{
-    success: boolean;
-    outfile: string;
-}, void, unknown>;
+export declare function runExecutor(options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("@nx/js/src/utils/typescript/compile-typescript-files").TypescriptCompilationResult, void, unknown>;
 export default runExecutor;

package/src/executors/build/build.js

@@ -2,24 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runExecutor = void 0;
 const tslib_1 = require("tslib");
-require("../../utils/e2ePatch"); // intentional side effects
-const devkit_1 = require("@nrwl/devkit");
-const tsc_impl_1 = require("@nrwl/js/src/executors/tsc/tsc.impl");
+// import '../../utils/e2ePatch' // intentional side effects
+const devkit_1 = require("@nx/devkit");
+const tsc_impl_1 = require("@nx/js/src/executors/tsc/tsc.impl");
 const lib_1 = require("./lib");
 const utils_1 = require("../../utils");
 /**
  * @simondotm/nx-firebase:build executor is a
- *  customized version of @nrwl/js:tsc executor
+ *  customized version of @nx/js:tsc executor
  */
 function runExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runExecutor_1() {
-        var e_1, _a;
+        var _a, e_1, _b, _c;
         (0, utils_1.checkNxVersion)();
         if (process.env.NX_WORKSPACE_ROOT_PATH) {
             devkit_1.logger.warn(`WARNING: @simondotm/nx-firebase plugin is located outside this workspace, NX_WORKSPACE_ROOT_PATH has been set to ${process.env.NX_WORKSPACE_ROOT_PATH}`);
         }
         /*
-        // --updateBuildableProjectDepsInPackageJson is true by default for @nrwl/js:tsc
+        // --updateBuildableProjectDepsInPackageJson is true by default for @nx/js:tsc
         // https://nx.dev/packages/js/executors/tsc
         // but we havent programmed our executor schema to match yet, so hack them in here.
         const customOptions: ExecutorOptions = {
@@ -49,20 +49,27 @@ function runExecutor(options, context) {
             //
             // with --watch enabled, this loop will run until the process terminates
             // https://github.com/nrwl/nx/blob/8bfc0b5527e3ea3acd14e4a11254505f02046d98/packages/js/src/executors/tsc/tsc.impl.ts#L176
-            for (var _b = tslib_1.__asyncValues((0, tsc_impl_1.tscExecutor)(options, context)), _c; _c = yield tslib_1.__await(_b.next()), !_c.done;) {
-                const output = _c.value;
-                // logger.info(output)
-                if (output.success) {
-                    // Post-process Firebase Functions dependencies if compilation succeeded
-                    yield tslib_1.__await((0, lib_1.firebaseBuildExecutor)(context, options.outputPath));
+            for (var _d = true, _e = tslib_1.__asyncValues((0, tsc_impl_1.tscExecutor)(options, context)), _f; _f = yield tslib_1.__await(_e.next()), _a = _f.done, !_a;) {
+                _c = _f.value;
+                _d = false;
+                try {
+                    const output = _c;
+                    // logger.info(output)
+                    if (output.success) {
+                        // Post-process Firebase Functions dependencies if compilation succeeded
+                        yield tslib_1.__await((0, lib_1.firebaseBuildExecutor)(context, options.outputPath));
+                    }
+                    yield yield tslib_1.__await(output);
+                }
+                finally {
+                    _d = true;
                 }
-                yield yield tslib_1.__await(output);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) yield tslib_1.__await(_a.call(_b));
+                if (!_d && !_a && (_b = _e.return)) yield tslib_1.__await(_b.call(_e));
             }
             finally { if (e_1) throw e_1.error; }
         }

package/src/executors/build/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/executors/build/build.ts"],"names":[],"mappings":";;;;AAAA,gCAA6B,CAAC,2BAA2B;AACzD,yCAA+E;AAE/E,kEAAiE;AACjE,+BAA6C;AAC7C,uCAA4C;AAE5C;;;GAGG;AACH,SAAuB,WAAW,CAChC,OAAwB,EACxB,OAAwB;;;QAExB,IAAA,sBAAc,GAAE,CAAA;QAEhB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;YACtC,eAAM,CAAC,IAAI,CACT,oHAAoH,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,CACzJ,CAAA;SACF;QAED;;;;;;;;;UASE;QACF,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YAClC,eAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SAC3D;QAED,8EAA8E;QAE9E,kDAAkD;QAClD,yDAAyD;QAEzD,mFAAmF;QACnF,wDAAwD;QACxD,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,uDAAuD;YACvD,sBAAM,IAAA,gCAAuB,GAAE;YAC/B,8CAA8C;aADf,CAAA;YAC/B,8CAA8C;SAC/C;;YAED,uDAAuD;YACvD,gEAAgE;YAChE,EAAE;YACF,wEAAwE;YACxE,0HAA0H;YAC1H,KAA2B,IAAA,KAAA,sBAAA,IAAA,sBAAW,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA7C,MAAM,MAAM,WAAA,CAAA;gBACrB,sBAAsB;gBACtB,IAAI,MAAM,CAAC,OAAO,EAAE;oBAClB,wEAAwE;oBACxE,sBAAM,IAAA,2BAAqB,EAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA,CAAA;iBACzD;gBACD,4BAAM,MAAM,CAAA,CAAA;aACb;;;;;;;;;IACH,CAAC;CAAA;AApDD,kCAoDC;AAED,0CAA0C;AAC1C,gDAAgD;AAChD,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/executors/build/build.ts"],"names":[],"mappings":";;;;AAAA,4DAA4D;AAC5D,uCAA6E;AAE7E,gEAA+D;AAC/D,+BAA6C;AAC7C,uCAA4C;AAE5C;;;GAGG;AACH,SAAuB,WAAW,CAChC,OAAwB,EACxB,OAAwB;;;QAExB,IAAA,sBAAc,GAAE,CAAA;QAEhB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;YACtC,eAAM,CAAC,IAAI,CACT,oHAAoH,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,CACzJ,CAAA;SACF;QAED;;;;;;;;;UASE;QACF,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YAClC,eAAM,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SAC3D;QAED,8EAA8E;QAE9E,kDAAkD;QAClD,yDAAyD;QAEzD,mFAAmF;QACnF,wDAAwD;QACxD,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,uDAAuD;YACvD,sBAAM,IAAA,gCAAuB,GAAE;YAC/B,8CAA8C;aADf,CAAA;YAC/B,8CAA8C;SAC/C;;YAED,uDAAuD;YACvD,gEAAgE;YAChE,EAAE;YACF,wEAAwE;YACxE,0HAA0H;YAC1H,KAA2B,eAAA,KAAA,sBAAA,IAAA,sBAAW,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA,IAAA;gBAA7B,cAA6B;gBAA7B,WAA6B;;oBAA7C,MAAM,MAAM,KAAA,CAAA;oBACrB,sBAAsB;oBACtB,IAAI,MAAM,CAAC,OAAO,EAAE;wBAClB,wEAAwE;wBACxE,sBAAM,IAAA,2BAAqB,EAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,CAAA,CAAA;qBACzD;oBACD,4BAAM,MAAM,CAAA,CAAA;;;;;aACb;;;;;;;;;IACH,CAAC;CAAA;AApDD,kCAoDC;AAED,0CAA0C;AAC1C,gDAAgD;AAChD,kBAAe,WAAW,CAAA"}

package/src/executors/build/lib/copy-dependencies.d.ts

@@ -1,3 +1,3 @@
-import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nx/workspace/src/utilities/buildable-libs-utils';
 export declare const FIREBASE_DEPS_DIR = "libs";
 export declare function copyFirebaseDependencies(outputPath: string, workspaceRoot: string, projectDependencies: DependentBuildableProjectNode[]): Promise<Record<string, DependentBuildableProjectNode>>;

package/src/executors/build/lib/copy-dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyFirebaseDependencies = exports.FIREBASE_DEPS_DIR = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const fs_extra_1 = require("fs-extra");
 exports.FIREBASE_DEPS_DIR = 'libs';
 function copyFirebaseDependencies(outputPath, workspaceRoot, projectDependencies) {

package/src/executors/build/lib/copy-dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"copy-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/executors/build/lib/copy-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AAExD,uCAA+B;AAElB,QAAA,iBAAiB,GAAG,MAAM,CAAA;AAEvC,SAAsB,wBAAwB,CAC5C,UAAkB,EAClB,aAAqB,EACrB,mBAAoD;;QAEpD,wEAAwE;QACxE,gDAAgD;QAChD,6CAA6C;QAC7C,qFAAqF;QACrF,EAAE;QACF,qBAAqB;QACrB,wDAAwD;QACxD,wFAAwF;QACxF,gHAAgH;QAEhH,2GAA2G;QAC3G,MAAM,cAAc,GAAkD,EAAE,CAAA;QACxE,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE;YACrC,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAA,CAAC,sCAAsC;YACxE,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAA,CAAC,sCAAsC;YAC7E,cAAc,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAA;YACtC,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/D,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAC9B,aAAa,EACb,UAAU,EACV,yBAAiB,EACjB,gBAAgB,CACjB,CAAA;YACD,gKAAgK;YAChK,+HAA+H;YAC/H,sEAAsE;YACtE,+FAA+F;YAC/F,gGAAgG;YAChG,8GAA8G;YAC9G,wIAAwI;YACxI,sJAAsJ;YAEtJ,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,aAAa,EACb,UAAU,EACV,cAAc,EACd,gBAAgB,CACjB,CAAA;YACD,IAAI;gBACF,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;oBAClC,eAAM,CAAC,IAAI,CACT,0CAA0C,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,MAAM,SAAS,MAAM,GAAG,CAC3F,CAAA;oBACD,eAAM,CAAC,IAAI,CACT,0CAA0C,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,MAAM,SAAS,cAAc,GAAG,CACnG,CAAA;iBACF;gBACD,MAAM,IAAA,eAAI,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBAC1B,MAAM,IAAA,eAAI,EAAC,MAAM,EAAE,cAAc,CAAC,CAAA;gBAClC,eAAM,CAAC,GAAG,CAAC,+BAA+B,GAAG,CAAC,IAAI,GAAG,CAAC,CAAA;aACvD;YAAC,OAAO,GAAG,EAAE;gBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;aAC1B;SACF;QAED,OAAO,cAAc,CAAA;IACvB,CAAC;CAAA;AA7DD,4DA6DC"}
+{"version":3,"file":"copy-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/executors/build/lib/copy-dependencies.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,uCAA+B;AAElB,QAAA,iBAAiB,GAAG,MAAM,CAAA;AAEvC,SAAsB,wBAAwB,CAC5C,UAAkB,EAClB,aAAqB,EACrB,mBAAoD;;QAEpD,wEAAwE;QACxE,gDAAgD;QAChD,6CAA6C;QAC7C,qFAAqF;QACrF,EAAE;QACF,qBAAqB;QACrB,wDAAwD;QACxD,wFAAwF;QACxF,gHAAgH;QAEhH,2GAA2G;QAC3G,MAAM,cAAc,GAAkD,EAAE,CAAA;QACxE,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE;YACrC,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAA,CAAC,sCAAsC;YACxE,MAAM,gBAAgB,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAA,CAAC,sCAAsC;YAC7E,cAAc,CAAC,gBAAgB,CAAC,GAAG,GAAG,CAAA;YACtC,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAAC,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/D,MAAM,MAAM,GAAG,IAAA,0BAAiB,EAC9B,aAAa,EACb,UAAU,EACV,yBAAiB,EACjB,gBAAgB,CACjB,CAAA;YACD,gKAAgK;YAChK,+HAA+H;YAC/H,sEAAsE;YACtE,+FAA+F;YAC/F,gGAAgG;YAChG,8GAA8G;YAC9G,wIAAwI;YACxI,sJAAsJ;YAEtJ,MAAM,cAAc,GAAG,IAAA,0BAAiB,EACtC,aAAa,EACb,UAAU,EACV,cAAc,EACd,gBAAgB,CACjB,CAAA;YACD,IAAI;gBACF,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;oBAClC,eAAM,CAAC,IAAI,CACT,0CAA0C,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,MAAM,SAAS,MAAM,GAAG,CAC3F,CAAA;oBACD,eAAM,CAAC,IAAI,CACT,0CAA0C,GAAG,CAAC,IAAI,CAAC,IAAI,WAAW,MAAM,SAAS,cAAc,GAAG,CACnG,CAAA;iBACF;gBACD,MAAM,IAAA,eAAI,EAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBAC1B,MAAM,IAAA,eAAI,EAAC,MAAM,EAAE,cAAc,CAAC,CAAA;gBAClC,eAAM,CAAC,GAAG,CAAC,+BAA+B,GAAG,CAAC,IAAI,GAAG,CAAC,CAAA;aACvD;YAAC,OAAO,GAAG,EAAE;gBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;aAC1B;SACF;QAED,OAAO,cAAc,CAAA;IACvB,CAAC;CAAA;AA7DD,4DA6DC"}

package/src/executors/build/lib/firebase-build.d.ts

@@ -1,2 +1,2 @@
-import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorContext } from '@nx/devkit';
 export declare function firebaseBuildExecutor(context: ExecutorContext, outputPath: string): Promise<void>;

package/src/executors/build/lib/get-dependencies.d.ts

@@ -1,8 +1,8 @@
-import { ExecutorContext, ProjectGraphProjectNode } from '@nrwl/devkit';
-import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
-export declare type FirebaseDependencies = {
+import { ExecutorContext, ProjectGraphProjectNode } from '@nx/devkit';
+import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+export type FirebaseDependencies = {
     projectDependencies: DependentBuildableProjectNode[];
     npmDependencies: DependentBuildableProjectNode[];
-    target: ProjectGraphProjectNode<unknown>;
+    target: ProjectGraphProjectNode;
 };
 export declare function getFirebaseDependencies(context: ExecutorContext): Promise<FirebaseDependencies>;

package/src/executors/build/lib/get-dependencies.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirebaseDependencies = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nrwl/devkit");
-const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
+const devkit_1 = require("@nx/devkit");
+const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 function getFirebaseDependencies(context) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         devkit_1.logger.log(`- Processing dependencies for firebase functions app '${context.projectName}':`);
@@ -18,13 +18,11 @@ function getFirebaseDependencies(context) {
         // NX 13.x file - https://github.com/nrwl/nx/blob/1b0092c69f64e77abd5fc54bc034ba45267c8f91/packages/nx/src/project-graph/project-graph.ts#L87
         // const projectGraph = await createProjectGraphAsync()
         // SM: in Nx 14.5.x projectGraph is passed in via context
-        // @nrwl/js:tsc executor uses readCachedProjectGraph, so we'll use it too
+        // @nx/js:tsc executor uses readCachedProjectGraph, so we'll use it too
         // https://github.com/nrwl/nx/blob/13.10.x/packages/js/src/utils/check-dependencies.ts
         // https://github.com/nrwl/nx/blob/14.5.x/packages/js/src/utils/check-dependencies.ts
-        const projectGraph = (0, devkit_1.readCachedProjectGraph)();
-        const { target, dependencies, nonBuildableDependencies, topLevelDependencies, } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, 
-        // context.projectGraph, // NX14.5.x+ only
-        context.root, context.projectName, context.targetName, context.configurationName);
+        // const projectGraph = readCachedProjectGraph()
+        const { target, dependencies, nonBuildableDependencies, topLevelDependencies, } = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
         if (process.env.NX_VERBOSE_LOGGING) {
             devkit_1.logger.info('calculated dependencies=' + JSON.stringify(dependencies, null, 3));
             devkit_1.logger.info('target=' + JSON.stringify(target, null, 3));

package/src/executors/build/lib/get-dependencies.js.map

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

package/src/executors/build/lib/rewrite-package.d.ts

@@ -1,4 +1,4 @@
-import { DependentBuildableProjectNode } from '@nrwl/workspace/src/utilities/buildable-libs-utils';
+import { DependentBuildableProjectNode } from '@nx/workspace/src/utilities/buildable-libs-utils';
 /**
  * rewrite references to library packages in the functions package.json
  * to be local package references to the copies we made

package/src/executors/build/lib/rewrite-package.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteFirebasePackage = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const copy_dependencies_1 = require("./copy-dependencies");
 /**
  * rewrite references to library packages in the functions package.json

package/src/executors/build/lib/rewrite-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"rewrite-package.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/executors/build/lib/rewrite-package.ts"],"names":[],"mappings":";;;AAAA,yCAKqB;AAErB,2DAAuD;AAEvD;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,UAAkB,EAClB,cAA6D;IAE7D,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IAE1E,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAClC,eAAM,CAAC,IAAI,CAAC,4BAA4B,oBAAoB,GAAG,CAAC,CAAA;KACjE;IACD,MAAM,oBAAoB,GAAG,IAAA,qBAAY,EAAC,oBAAoB,CAAC,CAAA;IAC/D,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,YAAY,CAAA;IAC9D,IAAI,oBAAoB,EAAE;QACxB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YAClC,eAAM,CAAC,IAAI,CACT,mEAAmE,CACpE,CAAA;SACF;QACD,KAAK,MAAM,CAAC,IAAI,oBAAoB,EAAE;YACpC,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAClC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;gBAClC,eAAM,CAAC,IAAI,CACT,0BAA0B,CAAC,iBAAiB,QAAQ,KAAK,SAAS,EAAE,CACrE,CAAA;aACF;YACD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,GAAG,QAAQ,IAAA,0BAAiB,EACxC,GAAG,EACH,qCAAiB,EACjB,QAAQ,CAAC,IAAI,CAAC,IAAI,CACnB,EAAE,CAAA;gBACH,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;oBAClC,eAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAA;iBACtD;gBACD,oBAAoB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAA;aACnC;SACF;KACF;IACD,IAAA,sBAAa,EAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;IACzD,eAAM,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;IACvD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAClC,eAAM,CAAC,IAAI,CACT,4BAA4B,IAAI,CAAC,SAAS,CACxC,oBAAoB,EACpB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAA;KACF;AACH,CAAC;AAhDD,wDAgDC"}
+{"version":3,"file":"rewrite-package.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/executors/build/lib/rewrite-package.ts"],"names":[],"mappings":";;;AAAA,uCAKmB;AAEnB,2DAAuD;AAEvD;;;;;GAKG;AACH,SAAgB,sBAAsB,CACpC,UAAkB,EAClB,cAA6D;IAE7D,MAAM,oBAAoB,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IAE1E,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAClC,eAAM,CAAC,IAAI,CAAC,4BAA4B,oBAAoB,GAAG,CAAC,CAAA;KACjE;IACD,MAAM,oBAAoB,GAAG,IAAA,qBAAY,EAAC,oBAAoB,CAAC,CAAA;IAC/D,MAAM,oBAAoB,GAAG,oBAAoB,CAAC,YAAY,CAAA;IAC9D,IAAI,oBAAoB,EAAE;QACxB,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;YAClC,eAAM,CAAC,IAAI,CACT,mEAAmE,CACpE,CAAA;SACF;QACD,KAAK,MAAM,CAAC,IAAI,oBAAoB,EAAE;YACpC,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YAClC,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;gBAClC,eAAM,CAAC,IAAI,CACT,0BAA0B,CAAC,iBAAiB,QAAQ,KAAK,SAAS,EAAE,CACrE,CAAA;aACF;YACD,IAAI,QAAQ,EAAE;gBACZ,MAAM,QAAQ,GAAG,QAAQ,IAAA,0BAAiB,EACxC,GAAG,EACH,qCAAiB,EACjB,QAAQ,CAAC,IAAI,CAAC,IAAI,CACnB,EAAE,CAAA;gBACH,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;oBAClC,eAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,QAAQ,GAAG,CAAC,CAAA;iBACtD;gBACD,oBAAoB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAA;aACnC;SACF;KACF;IACD,IAAA,sBAAa,EAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;IACzD,eAAM,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAA;IACvD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE;QAClC,eAAM,CAAC,IAAI,CACT,4BAA4B,IAAI,CAAC,SAAS,CACxC,oBAAoB,EACpB,IAAI,EACJ,CAAC,CACF,EAAE,CACJ,CAAA;KACF;AACH,CAAC;AAhDD,wDAgDC"}

package/src/executors/build/schema.json

@@ -4,7 +4,6 @@
   "outputCapture": "direct-nodejs",
   "title": "Typescript Build Target",
   "description": "Builds using TypeScript.",
-  "cli": "nx",
   "type": "object",
   "properties": {
     "main": {
@@ -62,7 +61,10 @@
     "buildableProjectDepsInPackageJsonType": {
       "type": "string",
       "description": "When `updateBuildableProjectDepsInPackageJson` is `true`, this adds dependencies to either `peerDependencies` or `dependencies`.",
-      "enum": ["dependencies", "peerDependencies"],
+      "enum": [
+        "dependencies",
+        "peerDependencies"
+      ],
       "default": "dependencies"
     },
     "external": {
@@ -70,7 +72,10 @@
       "oneOf": [
         {
           "type": "string",
-          "enum": ["all", "none"]
+          "enum": [
+            "all",
+            "none"
+          ]
         },
         {
           "type": "array",
@@ -86,10 +91,16 @@
         "type": "string"
       },
       "description": "List of target names that annotate a build target for a project",
-      "default": ["build"]
+      "default": [
+        "build"
+      ]
     }
   },
-  "required": ["main", "outputPath", "tsConfig"],
+  "required": [
+    "main",
+    "outputPath",
+    "tsConfig"
+  ],
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -117,7 +128,11 @@
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": [
+            "glob",
+            "input",
+            "output"
+          ]
         },
         {
           "type": "string"
@@ -141,7 +156,9 @@
             }
           },
           "additionalProperties": false,
-          "required": ["name"]
+          "required": [
+            "name"
+          ]
         }
       ]
     }

package/src/generators/application/application.d.ts

@@ -1,9 +1,8 @@
-import '../../utils/e2ePatch';
-import { GeneratorCallback, Tree } from '@nrwl/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import type { ApplicationGeneratorOptions } from './schema';
 /**
  * Firebase 'functions' application generator
- * Uses the `@nrwl/node` application generator as a base implementation
+ * Uses the `@nx/node` application generator as a base implementation
  *
  * @param tree
  * @param rawOptions

package/src/generators/application/application.js

@@ -2,16 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationSchematic = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
-require("../../utils/e2ePatch"); // intentional side effects
-const devkit_1 = require("@nrwl/devkit");
-const node_1 = require("@nrwl/node");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const devkit_1 = require("@nx/devkit");
+const node_1 = require("@nx/node");
 const init_1 = require("../init/init");
 const lib_1 = require("./lib");
 const delete_files_1 = require("./lib/delete-files");
 /**
  * Firebase 'functions' application generator
- * Uses the `@nrwl/node` application generator as a base implementation
+ * Uses the `@nx/node` application generator as a base implementation
  *
  * @param tree
  * @param rawOptions
@@ -33,7 +31,7 @@ function applicationGenerator(tree, rawOptions) {
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(initTask, nodeApplicationTask);
+        return (0, devkit_1.runTasksInSerial)(initTask, nodeApplicationTask);
     });
 }
 exports.applicationGenerator = applicationGenerator;

package/src/generators/application/application.js.map

@@ -1 +1 @@
-{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,gCAA6B,CAAC,2BAA2B;AAEzD,yCAA8D;AAC9D,qCAA6E;AAC7E,2FAAoF;AACpF,uCAA4C;AAC5C,+BAMc;AACd,qDAAgD;AAGhD;;;;;;;GAOG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAuC;;QAEvC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAa,EAAC,IAAI,EAAE;YACzC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;QACF,MAAM,mBAAmB,GAAG,MAAM,IAAA,2BAAwB,EACxD,IAAI,EACJ,IAAA,uCAAiC,EAAC,OAAO,CAAC,CAE3C,CAAA;QACD,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC1B,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC1B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC7B,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEzB,mEAAmE;QACnE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;SACxB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;IACxD,CAAC;CAAA;AAzBD,oDAyBC;AAED,kBAAe,oBAAoB,CAAA;AAEtB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAA"}
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAEA,uCAA8E;AAC9E,mCAA2E;AAC3E,uCAA4C;AAC5C,+BAMc;AACd,qDAAgD;AAGhD;;;;;;;GAOG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,UAAuC;;QAEvC,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;QAClD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAa,EAAC,IAAI,EAAE;YACzC,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,UAAU,EAAE,IAAI;SACjB,CAAC,CAAA;QACF,MAAM,mBAAmB,GAAG,MAAM,IAAA,2BAAwB,EACxD,IAAI,EACJ,IAAA,uCAAiC,EAAC,OAAO,CAAC,CAE3C,CAAA;QACD,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC1B,IAAA,iBAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC1B,IAAA,oBAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC7B,IAAA,gBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEzB,mEAAmE;QACnE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;SACxB;QAED,OAAO,IAAA,yBAAgB,EAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;IACxD,CAAC;CAAA;AAzBD,oDAyBC;AAED,kBAAe,oBAAoB,CAAA;AAEtB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAA"}

package/src/generators/application/lib/add-project.d.ts

@@ -1,4 +1,4 @@
-import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { ProjectConfiguration, Tree } from '@nx/devkit';
 import type { NormalizedOptions } from '../schema';
 export declare function getBuildTarget(project: ProjectConfiguration): {
     executor: string;

package/src/generators/application/lib/add-project.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = exports.getServeTarget = exports.getEmulateTarget = exports.getConfigTarget = exports.getDeployTarget = exports.getBuildTarget = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
 const utils_1 = require("../../../utils");
 /**
  * Return run-commands executor that is most compatible with host workspace version
@@ -12,7 +12,7 @@ function getRunCommandsExecutor() {
     const supportsNxRunCommands = utils_1.workspaceNxVersion.versionCode >= 140800;
     return supportsNxRunCommands
         ? 'nx:run-commands'
-        : '@nrwl/workspace:run-commands';
+        : '@nx/workspace:run-commands';
 }
 function getFirebaseProject(options) {
     if (options.project) {
@@ -68,7 +68,7 @@ function getEmulateTarget(options, project) {
         executor: getRunCommandsExecutor(),
         options: {
             commands: [
-                `node -e 'setTimeout(()=>{},5000)'`,
+                `node -e "setTimeout(()=>{},5000)"`,
                 `kill-port --port 9099,5001,8080,9000,5000,8085,9199,9299,4000,4400,4500`,
                 `firebase functions:config:get ${getFirebaseConfig(options)}${getFirebaseProject(options)} > ${(0, devkit_1.joinPathFragments)('dist', project.root)}/.runtimeconfig.json`,
                 `firebase emulators:start ${getFirebaseConfig(options)}${getFirebaseProject(options)}`,

package/src/generators/application/lib/add-project.js.map

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

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

@@ -1,4 +1,4 @@
-import { Tree } from '@nrwl/devkit';
+import { Tree } from '@nx/devkit';
 import type { NormalizedOptions } from '../schema';
 /**
  * Generate the firebase app specific files

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFiles = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
 const utils_1 = require("../../../utils");
 /**
  * Generate the firebase app specific files

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

@@ -1 +1 @@
-{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/create-files.ts"],"names":[],"mappings":";;;AAAA,yCAAmD;AACnD,yCAA+D;AAC/D,0CAAwE;AAGxE;;;;;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,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,IAAI,EAAE,OAAO,CAAC,WAAW;QAEzB,eAAe,EAAE,OAAO,CAAC,IAAI;QAC7B,iBAAiB;QACjB,qBAAqB;QAErB,mBAAmB,EAAnB,2BAAmB;QACnB,kBAAkB,EAAlB,0BAAkB;KACnB,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,qGAAqG;IACrG,wCAAwC;IACxC,kHAAkH;IAClH,iHAAiH;IACjH,qHAAqH;IACrH,6FAA6F;IAE7F,sFAAsF;IACtF,0DAA0D;IAE1D,4DAA4D;IAC5D,2DAA2D;IAC3D,oEAAoE;IACpE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,gBAAgB,CAAC,EACpD,EAAE,EACF,aAAa,CACd,CAAA;KACF;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,iBAAiB,CAAC,EACrD,EAAE,EAAE,kDAAkD;QACtD,aAAa,CACd,CAAA;KACF;IAED,kGAAkG;IAClG,sDAAsD;IACtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,kBAAkB,CAAC,EACtD,EAAE,EACF,aAAa,CACd,CAAA;KACF;IACD,SAAS;IACT,iEAAiE;IACjE,IAAI;AACN,CAAC;AA5ED,kCA4EC"}
+{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/create-files.ts"],"names":[],"mappings":";;;AAAA,uCAAiD;AACjD,uCAA6D;AAC7D,0CAAwE;AAGxE;;;;;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,IAAI,EAAE,OAAO,CAAC,WAAW;QACzB,IAAI,EAAE,OAAO,CAAC,WAAW;QAEzB,eAAe,EAAE,OAAO,CAAC,IAAI;QAC7B,iBAAiB;QACjB,qBAAqB;QAErB,mBAAmB,EAAnB,2BAAmB;QACnB,kBAAkB,EAAlB,0BAAkB;KACnB,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,qGAAqG;IACrG,wCAAwC;IACxC,kHAAkH;IAClH,iHAAiH;IACjH,qHAAqH;IACrH,6FAA6F;IAE7F,sFAAsF;IACtF,0DAA0D;IAE1D,4DAA4D;IAC5D,2DAA2D;IAC3D,oEAAoE;IACpE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,gBAAgB,CAAC,EACpD,EAAE,EACF,aAAa,CACd,CAAA;KACF;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,iBAAiB,CAAC,EACrD,EAAE,EAAE,kDAAkD;QACtD,aAAa,CACd,CAAA;KACF;IAED,kGAAkG;IAClG,sDAAsD;IACtD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,kBAAkB,CAAC,EACtD,EAAE,EACF,aAAa,CACd,CAAA;KACF;IACD,SAAS;IACT,iEAAiE;IACjE,IAAI;AACN,CAAC;AA5ED,kCA4EC"}

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

@@ -1,4 +1,4 @@
-import type { Tree } from '@nrwl/devkit';
+import type { Tree } from '@nx/devkit';
 import type { NormalizedOptions } from '../schema';
 /**
  * Delete unwanted files created by the node generator

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFiles = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 /**
  * Delete unwanted files created by the node generator
  * @param tree

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

@@ -1 +1 @@
-{"version":3,"file":"delete-files.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/delete-files.ts"],"names":[],"mappings":";;;AACA,yCAAgD;AAGhD;;;;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/application/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"}

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,5 +1,5 @@
-import type { Tree } from '@nrwl/devkit';
-import type { Schema as NodeApplicationGeneratorOptions } from '@nrwl/node/src/generators/application/schema';
+import type { Tree } from '@nx/devkit';
+import type { Schema as NodeApplicationGeneratorOptions } from '@nx/node/src/generators/application/schema';
 import type { ApplicationGeneratorOptions, NormalizedOptions } from '../schema';
 export declare function normalizeOptions(tree: Tree, options: ApplicationGeneratorOptions): NormalizedOptions;
 export declare function toNodeApplicationGeneratorOptions(options: NormalizedOptions): NodeApplicationGeneratorOptions;

package/src/generators/application/lib/normalize-options.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toNodeApplicationGeneratorOptions = exports.normalizeOptions = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const linter_1 = require("@nrwl/linter");
+const devkit_1 = require("@nx/devkit");
+const linter_1 = require("@nx/linter");
 function normalizeOptions(tree, options) {
     var _a, _b;
     // see https://github.com/nrwl/nx/blob/84cbcb7e105cd2b3bf5b3d84a519e5c52951e0f3/packages/js/src/generators/library/library.ts#L332

package/src/generators/application/lib/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAA2E;AAC3E,yCAAqC;AAIrC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAoC;;IAEpC,kIAAkI;IAClI,wEAAwE;IACxE,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;IACzC,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAA;IAER,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,gBAAgB,CACjB,CAAA;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;IAEvE,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QACrD,CAAC,CAAC,YAAY,WAAW,OAAO;QAChC,CAAC,CAAC,eAAe,CAAA;IAEnB,iDAAiD;IACjD,+DAA+D;IAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;QACnC,MAAM,KAAK,CACT,qDAAqD,kBAAkB,2DAA2D,CACnI,CAAA;KACF;IAED,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,kBAAkB,EAClB,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,IACjD;AACH,CAAC;AAtCD,4CAsCC;AAED,SAAgB,iCAAiC,CAC/C,OAA0B;IAE1B,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;KACzD,CAAA;AACH,CAAC;AAfD,8EAeC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/normalize-options.ts"],"names":[],"mappings":";;;AACA,uCAAyE;AACzE,uCAAmC;AAInC,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAoC;;IAEpC,kIAAkI;IAClI,wEAAwE;IACxE,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAA;IACzC,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS;QACxC,CAAC,CAAC,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,IAAI,IAAI,EAAE;QAChD,CAAC,CAAC,IAAI,CAAA;IAER,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,EAChC,gBAAgB,CACjB,CAAA;IAED,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;IAEvE,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QACrD,CAAC,CAAC,YAAY,WAAW,OAAO;QAChC,CAAC,CAAC,eAAe,CAAA;IAEnB,iDAAiD;IACjD,+DAA+D;IAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;QACnC,MAAM,KAAK,CACT,qDAAqD,kBAAkB,2DAA2D,CACnI,CAAA;KACF;IAED,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,kBAAkB,EAClB,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,eAAM,CAAC,MAAM,EACvC,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,IACjD;AACH,CAAC;AAtCD,4CAsCC;AAED,SAAgB,iCAAiC,CAC/C,OAA0B;IAE1B,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;KACzD,CAAA;AACH,CAAC;AAfD,8EAeC"}

package/src/generators/application/lib/update-tsconfig.d.ts

@@ -1,4 +1,4 @@
-import type { Tree } from '@nrwl/devkit';
+import type { Tree } from '@nx/devkit';
 import type { NormalizedOptions } from '../schema';
 /**
  * With firebase cli > 10.0.1 now compatible with node versions >=14 we can use es modules rather than commonjs

package/src/generators/application/lib/update-tsconfig.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsConfig = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../../../utils");
 /**
  * With firebase cli > 10.0.1 now compatible with node versions >=14 we can use es modules rather than commonjs

package/src/generators/application/lib/update-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,yCAA4D;AAC5D,0CAA+C;AAG/C;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,IAAU,EAAE,OAA0B;IACnE,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,CAAC,eAAe,CAAC,qBAAqB,GAAG,IAAI,CAAA;QACjD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,sBAAc,CAAA;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC,CACF,CAAA;AACH,CAAC;AAVD,wCAUC"}
+{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/application/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AACA,uCAA0D;AAC1D,0CAA+C;AAG/C;;;;;GAKG;AACH,SAAgB,cAAc,CAAC,IAAU,EAAE,OAA0B;IACnE,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;QACP,IAAI,CAAC,eAAe,CAAC,qBAAqB,GAAG,IAAI,CAAA;QACjD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,sBAAc,CAAA;QAC5C,OAAO,IAAI,CAAA;IACb,CAAC,CACF,CAAA;AACH,CAAC;AAVD,wCAUC"}

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

@@ -1,8 +1,8 @@
-import { Linter } from '@nrwl/linter'
+import { Linter } from '@nx/linter'
 import { UnitTestRunner } from '../../utils/test-runners'
 
 export interface ApplicationGeneratorOptions {
-  // standard @nrwl/node:app options
+  // standard @nx/node:app options
   name: string
   directory?: string
   frontendProject?: string

package/src/generators/application/schema.json

@@ -3,7 +3,6 @@
   "$id": "NxFirebaseApplicationGenerator",
   "title": "Nx Firebase Application Options Schema",
   "description": "Nx Firebase Application Options Schema.",
-  "cli": "nx",
   "type": "object",
   "properties": {
     "name": {
@@ -32,13 +31,19 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint", "none"],
+      "enum": [
+        "eslint",
+        "none"
+      ],
       "default": "eslint"
     },
     "unitTestRunner": {
       "description": "Test runner to use for unit tests.",
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": [
+        "jest",
+        "none"
+      ],
       "default": "jest"
     },
     "tags": {
@@ -65,5 +70,7 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name"]
+  "required": [
+    "name"
+  ]
 }

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

@@ -1,12 +1,11 @@
-import '../../utils/e2ePatch';
-import type { GeneratorCallback, Tree } from '@nrwl/devkit';
+import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { InitGeneratorOptions } from './schema';
 /**
  * `nx g @simondotm/nx-firebase:init` is based on the `@nrwl/nest` plugin
- *   which in turn is based on the `@nrwl/node` plugin
+ *   which in turn is based on the `@nx/node` plugin
  *
  * Ensures the necessary firebase packages are installed in the nx workspace
- * The `@nrwl/node` init generate also ensures jest configs
+ * The `@nx/node` init generate also ensures jest configs
  *
  * Docs say its for internal use only, but nest uses it, so we use it :)
  * https://nx.dev/packages/node/generators/init

package/src/generators/init/init.js

@@ -2,18 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initSchematic = exports.initGenerator = void 0;
 const tslib_1 = require("tslib");
-require("../../utils/e2ePatch"); // intentional side effects
-const devkit_1 = require("@nrwl/devkit");
-const node_1 = require("@nrwl/node");
-const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
+const devkit_1 = require("@nx/devkit");
+const node_1 = require("@nx/node");
+// import { runTasksInSerial } from '@nx/workspace/src/utilities/run-tasks-in-serial'
 const lib_1 = require("./lib");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 /**
  * `nx g @simondotm/nx-firebase:init` is based on the `@nrwl/nest` plugin
- *   which in turn is based on the `@nrwl/node` plugin
+ *   which in turn is based on the `@nx/node` plugin
  *
  * Ensures the necessary firebase packages are installed in the nx workspace
- * The `@nrwl/node` init generate also ensures jest configs
+ * The `@nx/node` init generate also ensures jest configs
  *
  * Docs say its for internal use only, but nest uses it, so we use it :)
  * https://nx.dev/packages/node/generators/init
@@ -27,7 +26,7 @@ function initGenerator(tree, rawOptions) {
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }
-        return (0, run_tasks_in_serial_1.runTasksInSerial)(nodeInitTask, installPackagesTask);
+        return (0, devkit_1.runTasksInSerial)(nodeInitTask, installPackagesTask);
     });
 }
 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":";;;;AAAA,gCAA6B,CAAC,2BAA2B;AAEzD,yCAA8D;AAC9D,qCAA+D;AAC/D,2FAAoF;AACpF,+BAAyD;AACzD,qEAA8D;AAG9D;;;;;;;;;GASG;AACH,SAAsB,aAAa,CACjC,IAAU,EACV,UAAgC;;QAEhC,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAA;QAC5C,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC3D,MAAM,mBAAmB,GAAG,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAA;QAEjD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;SACxB;QAED,OAAO,IAAA,sCAAgB,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;IAC5D,CAAC;CAAA;AAfD,sCAeC;AAED,kBAAe,aAAa,CAAA;AAEf,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAA"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/nx-firebase/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAEA,uCAA8E;AAC9E,mCAA6D;AAC7D,qFAAqF;AACrF,+BAAyD;AACzD,qEAA8D;AAG9D;;;;;;;;;GASG;AACH,SAAsB,aAAa,CACjC,IAAU,EACV,UAAgC;;QAEhC,IAAA,wCAAiB,EAAC,IAAI,CAAC,CAAA;QAEvB,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAA;QAC5C,MAAM,YAAY,GAAG,MAAM,IAAA,oBAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAC3D,MAAM,mBAAmB,GAAG,IAAA,qBAAe,EAAC,IAAI,CAAC,CAAA;QAEjD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAA;SACxB;QAED,OAAO,IAAA,yBAAgB,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;IAC5D,CAAC;CAAA;AAfD,sCAeC;AAED,kBAAe,aAAa,CAAA;AAEf,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAA"}

package/src/generators/init/lib/add-dependencies.d.ts

@@ -1,2 +1,2 @@
-import { GeneratorCallback, Tree } from '@nrwl/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 export declare function addDependencies(tree: Tree): GeneratorCallback;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addDependencies = void 0;
-const devkit_1 = require("@nrwl/devkit");
-const devkit_2 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
+const devkit_2 = require("@nx/devkit");
 const utils_1 = require("../../../utils");
 const versions_1 = require("../../../utils/versions");
 function addDependencies(tree) {
@@ -43,14 +43,14 @@ function addDependencies(tree) {
     // These dependencies are required by the plugin internals, most likely already in the host workspace
     // but add them if not. They are added with the same version that the host workspace is using.
     // This is cleaner than using peerDeps.
-    addDevDependencyIfNotPresent('@nrwl/devkit', utils_1.workspaceNxVersion.version);
+    addDevDependencyIfNotPresent('@nx/devkit', utils_1.workspaceNxVersion.version);
     // used by the plugin application generator
-    addDevDependencyIfNotPresent('@nrwl/linter', utils_1.workspaceNxVersion.version);
-    addDevDependencyIfNotPresent('@nrwl/jest', utils_1.workspaceNxVersion.version);
+    addDevDependencyIfNotPresent('@nx/linter', utils_1.workspaceNxVersion.version);
+    addDevDependencyIfNotPresent('@nx/jest', utils_1.workspaceNxVersion.version);
     // used by the plugin application generator as a proxy for creating a typescript app
-    addDevDependencyIfNotPresent('@nrwl/node', utils_1.workspaceNxVersion.version);
+    addDevDependencyIfNotPresent('@nx/node', utils_1.workspaceNxVersion.version);
     // used by the plugin application builder
-    addDevDependencyIfNotPresent('@nrwl/js', utils_1.workspaceNxVersion.version);
+    addDevDependencyIfNotPresent('@nx/js', utils_1.workspaceNxVersion.version);
     return (0, devkit_2.addDependenciesToPackageJson)(tree, dependencies, devDependencies);
 }
 exports.addDependencies = addDependencies;

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

@@ -1 +1 @@
-{"version":3,"file":"add-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/init/lib/add-dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAAgE;AAChE,yCAA2D;AAC3D,0CAAmD;AACnD,sDAQgC;AAEhC,SAAgB,eAAe,CAAC,IAAU;IACxC,MAAM,YAAY,GAA2B,EAAE,CAAA;IAC/C,MAAM,eAAe,GAA2B,EAAE,CAAA;IAElD,0EAA0E;IAC1E,8EAA8E;IAC9E,gGAAgG;IAChG,2EAA2E;IAC3E,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAA,CAAC,uBAAuB;IAE1E,SAAS,yBAAyB,CAChC,WAAmB,EACnB,cAAsB;QAEtB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;YAC1C,YAAY,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;SAC3C;IACH,CAAC;IACD,SAAS,4BAA4B,CACnC,WAAmB,EACnB,cAAsB;QAEtB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE;YAC7C,eAAe,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;SAC9C;IACH,CAAC;IAED,wBAAwB;IACxB,yBAAyB,CAAC,UAAU,EAAE,0BAAe,CAAC,CAAA;IACtD,yBAAyB,CAAC,gBAAgB,EAAE,+BAAoB,CAAC,CAAA;IACjE,yBAAyB,CAAC,oBAAoB,EAAE,mCAAwB,CAAC,CAAA;IAEzE,4DAA4D;IAC5D,kDAAkD;IAElD,4BAA4B;IAC5B,4BAA4B,CAAC,gBAAgB,EAAE,+BAAoB,CAAC,CAAA;IACpE,4BAA4B,CAC1B,yBAAyB,EACzB,uCAA4B,CAC7B,CAAA;IAED,2EAA2E;IAC3E,8CAA8C;IAC9C,4BAA4B,CAAC,WAAW,EAAE,0BAAe,CAAC,CAAA;IAE1D,6EAA6E;IAC7E,2GAA2G;IAC3G,QAAQ;IACR,yHAAyH;IACzH,EAAE;IAEF,qGAAqG;IACrG,8FAA8F;IAC9F,uCAAuC;IACvC,4BAA4B,CAAC,cAAc,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAExE,2CAA2C;IAC3C,4BAA4B,CAAC,cAAc,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACxE,4BAA4B,CAAC,YAAY,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAEtE,oFAAoF;IACpF,4BAA4B,CAAC,YAAY,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAEtE,yCAAyC;IACzC,4BAA4B,CAAC,UAAU,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAEpE,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;AAC1E,CAAC;AApED,0CAoEC"}
+{"version":3,"file":"add-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/init/lib/add-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAA8D;AAC9D,uCAAyD;AACzD,0CAAmD;AACnD,sDAQgC;AAEhC,SAAgB,eAAe,CAAC,IAAU;IACxC,MAAM,YAAY,GAA2B,EAAE,CAAA;IAC/C,MAAM,eAAe,GAA2B,EAAE,CAAA;IAElD,0EAA0E;IAC1E,8EAA8E;IAC9E,gGAAgG;IAChG,2EAA2E;IAC3E,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAA,CAAC,uBAAuB;IAE1E,SAAS,yBAAyB,CAChC,WAAmB,EACnB,cAAsB;QAEtB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;YAC1C,YAAY,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;SAC3C;IACH,CAAC;IACD,SAAS,4BAA4B,CACnC,WAAmB,EACnB,cAAsB;QAEtB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE;YAC7C,eAAe,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;SAC9C;IACH,CAAC;IAED,wBAAwB;IACxB,yBAAyB,CAAC,UAAU,EAAE,0BAAe,CAAC,CAAA;IACtD,yBAAyB,CAAC,gBAAgB,EAAE,+BAAoB,CAAC,CAAA;IACjE,yBAAyB,CAAC,oBAAoB,EAAE,mCAAwB,CAAC,CAAA;IAEzE,4DAA4D;IAC5D,kDAAkD;IAElD,4BAA4B;IAC5B,4BAA4B,CAAC,gBAAgB,EAAE,+BAAoB,CAAC,CAAA;IACpE,4BAA4B,CAC1B,yBAAyB,EACzB,uCAA4B,CAC7B,CAAA;IAED,2EAA2E;IAC3E,8CAA8C;IAC9C,4BAA4B,CAAC,WAAW,EAAE,0BAAe,CAAC,CAAA;IAE1D,6EAA6E;IAC7E,2GAA2G;IAC3G,QAAQ;IACR,yHAAyH;IACzH,EAAE;IAEF,qGAAqG;IACrG,8FAA8F;IAC9F,uCAAuC;IACvC,4BAA4B,CAAC,YAAY,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAEtE,2CAA2C;IAC3C,4BAA4B,CAAC,YAAY,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACtE,4BAA4B,CAAC,UAAU,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAEpE,oFAAoF;IACpF,4BAA4B,CAAC,UAAU,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAEpE,yCAAyC;IACzC,4BAA4B,CAAC,QAAQ,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAElE,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;AAC1E,CAAC;AApED,0CAoEC"}

package/src/generators/init/lib/add-git-ignore-entry.d.ts

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import { Tree } from '@nx/devkit';
 export declare const gitIgnoreEntries = "\n\n# Nx-Firebase\n.runtimeconfig.json\n**/.emulators/*\n**/.firebase/*\ndatabase-debug.log\nfirebase-debug.log\nfirestore-debug.log\npubsub-debug.log\nui-debug.log\n\n";
 export declare function addGitIgnoreEntry(host: Tree): void;

package/src/generators/init/schema.json

@@ -3,13 +3,15 @@
   "$id": "NxFirebaseInitGenerator",
   "title": "Init Firebase Plugin",
   "description": "Init Firebase Plugin.",
-  "cli": "nx",
   "type": "object",
   "properties": {
     "unitTestRunner": {
       "description": "Adds the specified unit test runner.",
       "type": "string",
-      "enum": ["jest", "none"],
+      "enum": [
+        "jest",
+        "none"
+      ],
       "default": "none"
     },
     "skipFormat": {

package/src/utils/e2ePatch.js

@@ -49,7 +49,7 @@ exports.e2eAppRoot = exports.fileExists = void 0;
 // https://github.com/nrwl/nx/issues/5065
 const path = require("path");
 const fs_1 = require("fs");
-// import { logger, readJsonFile } from '@nrwl/devkit'
+// import { logger, readJsonFile } from '@nx/devkit'
 // from https://github.com/nrwl/nx/blob/803d5ff126d20d1116d3a505233ddf7d971688d6/packages/nx/src/utils/app-root.ts#L9
 function fileExists(filePath) {
     try {

package/src/utils/e2ePatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2ePatch.js","sourceRoot":"","sources":["../../../../../packages/nx-firebase/src/utils/e2ePatch.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0CE;;;AAEF,8DAA8D;AAC9D,gGAAgG;AAChG,yCAAyC;AACzC,6BAA4B;AAE5B,2BAA6B;AAE7B,sDAAsD;AAEtD,qHAAqH;AACrH,SAAgB,UAAU,CAAC,QAAgB;IACzC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;KACnC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAA;KACb;AACH,CAAC;AAND,gCAMC;AAED,sDAAsD;AACtD,0DAA0D;AAC1D,sFAAsF;AACtF,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;IAC3C,qCAAqC;IACrC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAA;IACnD,0DAA0D;IAC1D,IACE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC5C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACrC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAC1C;QACA,kDAAkD;QAClD,OAAO,GAAG,CAAA;KACX;SAAM;QACL,yDAAyD;QACzD,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;KACpC;AACH,CAAC;AAED,oCAAoC;AACpC,8BAA8B;AAC9B,gFAAgF;AAChF,8BAA8B;AAC9B,6CAA6C;AAE7C,4BAA4B;AAE5B,sEAAsE;AACtE,kEAAkE;AAClE,uCAAuC;AAEvC,4DAA4D;AAC5D,mCAAmC;AAEnC,+FAA+F;AAC/F,eAAe;AACf,yBAAyB;AACzB,gCAAgC;AAChC,mCAAmC;AACnC,wCAAwC;AAExC,mDAAmD;AACnD,mBAAmB;AACnB,mFAAmF;AACnF,QAAQ;AACR,MAAM;AACN,mBAAmB;AACnB,IAAI;AAEJ,SAAS,YAAY;IACnB,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;IAEhD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QACzB,8EAA8E;QAC9E,4BAA4B;QAC5B,MAAM,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;QAC9C,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;QACrC,0BAA0B;QAE1B,IAAI,iBAAiB,KAAK,cAAc,EAAE;YACxC,kFAAkF;YAClF,OAAO,GAAG,cAAc,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,OAAO,CAAA;YAC5C,iBAAiB;YACjB,qIAAqI;YACrI,MAAM;SACP;aAAM;YACL,OAAO,GAAG,iBAAiB,CAAA;SAC5B;KACF;SAAM;QACL,6DAA6D;KAC9D;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAEY,QAAA,UAAU,GAAG,YAAY,EAAE,CAAA"}
+{"version":3,"file":"e2ePatch.js","sourceRoot":"","sources":["../../../../../packages/nx-firebase/src/utils/e2ePatch.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0CE;;;AAEF,8DAA8D;AAC9D,gGAAgG;AAChG,yCAAyC;AACzC,6BAA4B;AAE5B,2BAA6B;AAE7B,oDAAoD;AAEpD,qHAAqH;AACrH,SAAgB,UAAU,CAAC,QAAgB;IACzC,IAAI;QACF,OAAO,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAA;KACnC;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,KAAK,CAAA;KACb;AACH,CAAC;AAND,gCAMC;AAED,sDAAsD;AACtD,0DAA0D;AAC1D,sFAAsF;AACtF,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;IAC3C,qCAAqC;IACrC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAA;IACnD,0DAA0D;IAC1D,IACE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC5C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACrC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAC1C;QACA,kDAAkD;QAClD,OAAO,GAAG,CAAA;KACX;SAAM;QACL,yDAAyD;QACzD,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAA;KACpC;AACH,CAAC;AAED,oCAAoC;AACpC,8BAA8B;AAC9B,gFAAgF;AAChF,8BAA8B;AAC9B,6CAA6C;AAE7C,4BAA4B;AAE5B,sEAAsE;AACtE,kEAAkE;AAClE,uCAAuC;AAEvC,4DAA4D;AAC5D,mCAAmC;AAEnC,+FAA+F;AAC/F,eAAe;AACf,yBAAyB;AACzB,gCAAgC;AAChC,mCAAmC;AACnC,wCAAwC;AAExC,mDAAmD;AACnD,mBAAmB;AACnB,mFAAmF;AACnF,QAAQ;AACR,MAAM;AACN,mBAAmB;AACnB,IAAI;AAEJ,SAAS,YAAY;IACnB,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAA;IAEhD,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;QACzB,8EAA8E;QAC9E,4BAA4B;QAC5B,MAAM,iBAAiB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAA;QAC9C,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;QACrC,0BAA0B;QAE1B,IAAI,iBAAiB,KAAK,cAAc,EAAE;YACxC,kFAAkF;YAClF,OAAO,GAAG,cAAc,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,OAAO,CAAA;YAC5C,iBAAiB;YACjB,qIAAqI;YACrI,MAAM;SACP;aAAM;YACL,OAAO,GAAG,iBAAiB,CAAA;SAC5B;KACF;SAAM;QACL,6DAA6D;KAC9D;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAEY,QAAA,UAAU,GAAG,YAAY,EAAE,CAAA"}

package/src/utils/types.d.ts

@@ -1 +1 @@
-export declare type UnitTestRunner = 'jest' | 'none';
+export type UnitTestRunner = 'jest' | 'none';

package/src/utils/versions.d.ts

@@ -1,5 +1,5 @@
-export declare const pluginNxVersion = "^13.10.6";
-export declare const pluginNxVersionMajor = 13;
+export declare const pluginNxVersion = "^16.1.1";
+export declare const pluginNxVersionMajor = 16;
 export declare const tsLibVersion = "^2.0.0";
 export declare const firebaseAdminVersion = "^11.3.0";
 export declare const firebaseFunctionsVersion = "^4.1.0";

package/src/utils/versions.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.killportVersion = exports.tsConfigTarget = exports.firebaseNodeRuntime = exports.firebaseNodeEngine = exports.firebaseFunctionsTestVersion = exports.firebaseVersion = exports.firebaseToolsVersion = exports.firebaseFunctionsVersion = exports.firebaseAdminVersion = exports.tsLibVersion = exports.pluginNxVersionMajor = exports.pluginNxVersion = void 0;
 // Declare target version of Nx that the plugin is currently compatible with
-exports.pluginNxVersion = '^13.10.6';
-exports.pluginNxVersionMajor = 13;
+exports.pluginNxVersion = '^16.1.1';
+exports.pluginNxVersionMajor = 16;
 // Tslib version changes with each Nx version
 exports.tsLibVersion = '^2.0.0';
 // Firebase packages are not managed by the plugin

package/src/utils/versions.js.map

@@ -1 +1 @@
-{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-firebase/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA,4EAA4E;AAC/D,QAAA,eAAe,GAAG,UAAU,CAAA;AAC5B,QAAA,oBAAoB,GAAG,EAAE,CAAA;AAEtC,6CAA6C;AAChC,QAAA,YAAY,GAAG,QAAQ,CAAA;AAEpC,kDAAkD;AAClD,mEAAmE;AACtD,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,wBAAwB,GAAG,QAAQ,CAAA;AACnC,QAAA,oBAAoB,GAAG,UAAU,CAAA;AACjC,QAAA,eAAe,GAAG,SAAS,CAAA;AAC3B,QAAA,4BAA4B,GAAG,QAAQ,CAAA;AAEpD,+CAA+C;AAClC,QAAA,kBAAkB,GAAG,IAAI,CAAA;AACzB,QAAA,mBAAmB,GAAG,SAAS,0BAAkB,EAAE,CAAA;AAEhE,2FAA2F;AAE3F,MAAM,WAAW,GAA2B;IAC1C,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;CACf,CAAA;AAEY,QAAA,cAAc,GAAG,WAAW,CAAC,0BAAkB,CAAC,CAAA;AAE7D,IAAI,CAAC,sBAAc,EAAE;IACnB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;CAC5C;AAED,iDAAiD;AACpC,QAAA,eAAe,GAAG,QAAQ,CAAA"}
+{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/nx-firebase/src/utils/versions.ts"],"names":[],"mappings":";;;AAAA,4EAA4E;AAC/D,QAAA,eAAe,GAAG,SAAS,CAAA;AAC3B,QAAA,oBAAoB,GAAG,EAAE,CAAA;AAEtC,6CAA6C;AAChC,QAAA,YAAY,GAAG,QAAQ,CAAA;AAEpC,kDAAkD;AAClD,mEAAmE;AACtD,QAAA,oBAAoB,GAAG,SAAS,CAAA;AAChC,QAAA,wBAAwB,GAAG,QAAQ,CAAA;AACnC,QAAA,oBAAoB,GAAG,UAAU,CAAA;AACjC,QAAA,eAAe,GAAG,SAAS,CAAA;AAC3B,QAAA,4BAA4B,GAAG,QAAQ,CAAA;AAEpD,+CAA+C;AAClC,QAAA,kBAAkB,GAAG,IAAI,CAAA;AACzB,QAAA,mBAAmB,GAAG,SAAS,0BAAkB,EAAE,CAAA;AAEhE,2FAA2F;AAE3F,MAAM,WAAW,GAA2B;IAC1C,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;CACf,CAAA;AAEY,QAAA,cAAc,GAAG,WAAW,CAAC,0BAAkB,CAAC,CAAA;AAE7D,IAAI,CAAC,sBAAc,EAAE;IACnB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;CAC5C;AAED,iDAAiD;AACpC,QAAA,eAAe,GAAG,QAAQ,CAAA"}

package/src/utils/workspace.d.ts

@@ -1,4 +1,4 @@
-export declare type WorkspaceVersion = {
+export type WorkspaceVersion = {
     version: string;
     versionCode: number;
     major: number;

package/src/utils/workspace.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkNxVersion = exports.workspaceNxVersion = void 0;
-const devkit_1 = require("@nrwl/devkit");
+const devkit_1 = require("@nx/devkit");
 const versions_1 = require("./versions");
 function readNxWorkspaceVersion() {
     // Check the runtime Nx version being used by the current workspace

package/src/utils/workspace.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../packages/nx-firebase/src/utils/workspace.ts"],"names":[],"mappings":";;;AAAA,yCAAkE;AAClE,yCAAkE;AAqBlE,SAAS,sBAAsB;IAC7B,mEAAmE;IACnE,MAAM,WAAW,GAAG,iDAAiD,CAAA;IACrE,MAAM,gBAAgB,GAAG,IAAA,qBAAY,EACnC,GAAG,sBAAa,eAAe,CAChC,CAAA;IACD,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IACxE,IAAI,yBAAyB,EAAE;QAC7B,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACvE,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACjC,OAAO;gBACL,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC;gBAC9B,WAAW,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK;gBAChD,KAAK;gBACL,KAAK;aACN,CAAA;SACF;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,4DAA4D;AAC/C,QAAA,kBAAkB,GAAG,sBAAsB,EAAE,CAAA;AAE1D,SAAgB,cAAc;IAC5B,IAAI,0BAAkB,EAAE;QACtB,IAAI,0BAAkB,CAAC,KAAK,GAAG,+BAAoB,EAAE;YACnD,eAAM,CAAC,IAAI,CACT,0DAA0D,0BAAe,oDAAoD,0BAAkB,CAAC,OAAO,GAAG,CAC3J,CAAA;SACF;KACF;SAAM;QACL,eAAM,CAAC,IAAI,CACT,iGAAiG,CAClG,CAAA;KACF;AACH,CAAC;AAZD,wCAYC"}
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../packages/nx-firebase/src/utils/workspace.ts"],"names":[],"mappings":";;;AAAA,uCAAgE;AAChE,yCAAkE;AAqBlE,SAAS,sBAAsB;IAC7B,mEAAmE;IACnE,MAAM,WAAW,GAAG,iDAAiD,CAAA;IACrE,MAAM,gBAAgB,GAAG,IAAA,qBAAY,EACnC,GAAG,sBAAa,eAAe,CAChC,CAAA;IACD,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IACxE,IAAI,yBAAyB,EAAE;QAC7B,MAAM,kBAAkB,GAAG,yBAAyB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;QACvE,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAC7B,MAAM,MAAM,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YACjC,OAAO;gBACL,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC;gBAC9B,WAAW,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK;gBAChD,KAAK;gBACL,KAAK;aACN,CAAA;SACF;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,4DAA4D;AAC/C,QAAA,kBAAkB,GAAG,sBAAsB,EAAE,CAAA;AAE1D,SAAgB,cAAc;IAC5B,IAAI,0BAAkB,EAAE;QACtB,IAAI,0BAAkB,CAAC,KAAK,GAAG,+BAAoB,EAAE;YACnD,eAAM,CAAC,IAAI,CACT,0DAA0D,0BAAe,oDAAoD,0BAAkB,CAAC,OAAO,GAAG,CAC3J,CAAA;SACF;KACF;SAAM;QACL,eAAM,CAAC,IAAI,CACT,iGAAiG,CAClG,CAAA;KACF;AACH,CAAC;AAZD,wCAYC"}