@simondotm/nx-firebase 2.1.1 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simondotm/nx-firebase",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "A Firebase plugin for Nx monorepo workspaces.",
   "author": "Simon Morris",
   "license": "MIT",
@@ -21,11 +21,10 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
+    "@nx/devkit": ">= 16.1.1",
     "@nx/workspace": ">= 16.1.1",
     "nx": ">= 16.1.1"
   },
-  "dependencies": {
-    "@nx/node": "^16.1.1"
-  },
+  "dependencies": {},
   "types": "./src/index.d.ts"
 }

package/src/generators/function/files/package.json__tmpl__

@@ -5,7 +5,7 @@
     "test": "nx test <%= projectName %>",
     "lint": "nx lint <%= projectName %>",
     "build": "nx build <%= projectName %>",
-    "deploy": "nx deploy <%= projectName %>",
+    "deploy": "nx deploy <%= projectName %>"
   },
   "type": "<%= moduleType %>",
   "engines": {

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

@@ -1,15 +1,11 @@
 import type { GeneratorCallback, Tree } from '@nx/devkit';
 import type { InitGeneratorOptions } from './schema';
 /**
- * `nx g @simondotm/nx-firebase:init` is based on the `@nx/nest` plugin
- *   which in turn is based on the `@nx/node` plugin
+ * `nx g @simondotm/nx-firebase:init`
  *
  * Ensures the necessary firebase packages are installed in the nx workspace
- * The `@nx/node` init generate also ensures jest configs
+ * It also adds `@nx/node` if it is not already installed
  *
- * Docs say its for internal use only, but nest uses it, so we use it :)
- * https://nx.dev/packages/node/generators/init
  */
-export declare function initGenerator(tree: Tree, rawOptions: InitGeneratorOptions): Promise<GeneratorCallback>;
+export declare function initGenerator(tree: Tree, options: InitGeneratorOptions): Promise<GeneratorCallback>;
 export default initGenerator;
-export declare const initSchematic: (generatorOptions: InitGeneratorOptions) => (tree: any, context: any) => Promise<any>;

package/src/generators/init/init.js

@@ -1,32 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initSchematic = exports.initGenerator = void 0;
+exports.initGenerator = void 0;
 const tslib_1 = require("tslib");
-const devkit_1 = require("@nx/devkit");
-const node_1 = require("@nx/node");
 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 `@nx/nest` plugin
- *   which in turn is based on the `@nx/node` plugin
+ * `nx g @simondotm/nx-firebase:init`
  *
  * Ensures the necessary firebase packages are installed in the nx workspace
- * The `@nx/node` init generate also ensures jest configs
+ * It also adds `@nx/node` if it is not already installed
  *
- * Docs say its for internal use only, but nest uses it, so we use it :)
- * https://nx.dev/packages/node/generators/init
  */
-function initGenerator(tree, rawOptions) {
+function initGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = (0, lib_1.normalizeOptions)(rawOptions);
-        const nodeInitTask = yield (0, node_1.initGenerator)(tree, options);
-        const installPackagesTask = (0, lib_1.addDependencies)(tree);
         (0, add_git_ignore_entry_1.addGitIgnore)(tree);
         (0, add_git_ignore_entry_1.addNxIgnore)(tree);
-        return (0, devkit_1.runTasksInSerial)(nodeInitTask, installPackagesTask);
+        return (0, lib_1.addDependencies)(tree);
     });
 }
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;
-exports.initSchematic = (0, devkit_1.convertNxGenerator)(initGenerator);
 //# sourceMappingURL=init.js.map

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,uCAAiE;AACjE,mCAA6D;AAC7D,+BAAyD;AACzD,qEAAsE;AAGtE;;;;;;;;;GASG;AACH,SAAsB,aAAa,CACjC,IAAU,EACV,UAAgC;;QAEhC,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;QACjD,IAAA,mCAAY,EAAC,IAAI,CAAC,CAAA;QAClB,IAAA,kCAAW,EAAC,IAAI,CAAC,CAAA;QAEjB,OAAO,IAAA,yBAAgB,EAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;IAC5D,CAAC;CAAA;AAXD,sCAWC;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":";;;;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"}

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

@@ -11,14 +11,15 @@ function addDependencies(tree) {
     // This is atypical for Nx plugins that usually migrate versions automatically
     //  however the nx-firebase plugin is not (currently) opinionated about which version is needed,
     //  so this ensures workspaces retain control over their firebase versions.
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json'); //readRootPackageJson()
+    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
     function addDependencyIfNotPresent(packageName, packageVersion) {
-        if (!packageJson.dependencies[packageName]) {
+        if (!packageJson.dependencies || !packageJson.dependencies[packageName]) {
             dependencies[packageName] = packageVersion;
         }
     }
     function addDevDependencyIfNotPresent(packageName, packageVersion) {
-        if (!packageJson.devDependencies[packageName]) {
+        if (!packageJson.devDependencies ||
+            !packageJson.devDependencies[packageName]) {
             devDependencies[packageName] = packageVersion;
         }
     }
@@ -34,21 +35,11 @@ function addDependencies(tree) {
     // 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);
-    // TODO: find out if Nx devkit adds these versions even if they already exist
-    // for now, only add them if they aren't in the workspace already at the same version as the host workspace
-    // from:
-    // https://github.com/nrwl/nx/blob/5b7dba1cb78cabcf631129b4ce8163406b9c1328/packages/devkit/src/utils/package-json.ts#L84
-    //
-    // 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('@nx/devkit', utils_1.workspaceNxVersion.version);
-    // used by the plugin function generator as a proxy for creating a typescript app
+    // @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
+    // we defer to @nx/node to install its own plugins such as @nx/eslint, @nx/jest, @nx/js, @nx/esbuild, @nx/webpack etc.
     addDevDependencyIfNotPresent('@nx/node', utils_1.workspaceNxVersion.version);
-    addDevDependencyIfNotPresent('@nx/linter', utils_1.workspaceNxVersion.version);
-    addDevDependencyIfNotPresent('@nx/jest', utils_1.workspaceNxVersion.version);
-    addDevDependencyIfNotPresent('@nx/esbuild', utils_1.workspaceNxVersion.version);
-    addDevDependencyIfNotPresent('@nx/js', utils_1.workspaceNxVersion.version);
     return (0, devkit_1.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,uCAKmB;AACnB,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,iFAAiF;IACjF,4BAA4B,CAAC,UAAU,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACpE,4BAA4B,CAAC,YAAY,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACtE,4BAA4B,CAAC,UAAU,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACpE,4BAA4B,CAAC,aAAa,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACvE,4BAA4B,CAAC,QAAQ,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IAElE,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;AAC1E,CAAC;AAjED,0CAiEC"}
+{"version":3,"file":"add-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/init/lib/add-dependencies.ts"],"names":[],"mappings":";;;AAAA,uCAKmB;AACnB,0CAAmD;AACnD,sDAOgC;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;IAElD,SAAS,yBAAyB,CAChC,WAAmB,EACnB,cAAsB;QAEtB,IAAI,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE;YACvE,YAAY,CAAC,WAAW,CAAC,GAAG,cAAc,CAAA;SAC3C;IACH,CAAC;IACD,SAAS,4BAA4B,CACnC,WAAmB,EACnB,cAAsB;QAEtB,IACE,CAAC,WAAW,CAAC,eAAe;YAC5B,CAAC,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,EACzC;YACA,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,6FAA6F;IAC7F,4FAA4F;IAC5F,mGAAmG;IACnG,sHAAsH;IACtH,4BAA4B,CAAC,UAAU,EAAE,0BAAkB,CAAC,OAAO,CAAC,CAAA;IACpE,OAAO,IAAA,qCAA4B,EAAC,IAAI,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;AAC1E,CAAC;AAvDD,0CAuDC"}

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

@@ -1,3 +1,2 @@
 export * from './add-dependencies';
-export * from './normalize-options';
 export * from './add-git-ignore-entry';

package/src/generators/init/lib/index.js

@@ -2,6 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./add-dependencies"), exports);
-tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./add-git-ignore-entry"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/init/lib/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,8DAAmC;AACnC,iEAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/init/lib/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,iEAAsC"}

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

@@ -1,6 +1 @@
-export interface InitGeneratorOptions {
-  unitTestRunner?: 'jest' | 'none'
-  skipFormat?: boolean
-  js?: boolean
-  rootProject?: boolean
-}
+export type InitGeneratorOptions = unknown

package/src/generators/init/schema.json

@@ -4,23 +4,6 @@
   "title": "Init Firebase Plugin",
   "description": "Init Firebase Plugin.",
   "type": "object",
-  "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner.",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false
-    },
-    "js": {
-      "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
-    }
-  },
+  "properties": {},
   "required": []
 }

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

@@ -1,2 +0,0 @@
-import type { InitGeneratorOptions } from '../schema';
-export declare function normalizeOptions(options: InitGeneratorOptions): InitGeneratorOptions;

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

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeOptions = void 0;
-function normalizeOptions(options) {
-    var _a;
-    return Object.assign(Object.assign({}, options), { unitTestRunner: (_a = options.unitTestRunner) !== null && _a !== void 0 ? _a : 'jest' });
-}
-exports.normalizeOptions = normalizeOptions;
-//# sourceMappingURL=normalize-options.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nx-firebase/src/generators/init/lib/normalize-options.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAC9B,OAA6B;;IAE7B,uCACK,OAAO,KACV,cAAc,EAAE,MAAA,OAAO,CAAC,cAAc,mCAAI,MAAM,IACjD;AACH,CAAC;AAPD,4CAOC"}