@nx/plugin 17.0.0-beta.1 → 17.0.0-beta.4

package/executors.json

@@ -1,12 +1,4 @@
 {
-  "builders": {
-    "e2e": {
-      "implementation": "./src/executors/e2e/compat",
-      "schema": "./src/executors/e2e/schema.json",
-      "description": "Creates and runs the E2E tests for an Nx Plugin.",
-      "x-deprecated": "@nx/plugin:e2e is deprecated and will be removed in Nx 18. Use @nx/jest:jest instead."
-    }
-  },
   "executors": {
     "e2e": {
       "implementation": "./src/executors/e2e/e2e.impl",

package/generators.json

@@ -45,37 +45,5 @@
       "hidden": true,
       "x-use-standalone-layout": true
     }
-  },
-  "schematics": {
-    "plugin": {
-      "factory": "./src/generators/plugin/plugin#pluginSchematic",
-      "schema": "./src/generators/plugin/schema.json",
-      "description": "Create a Nx Plugin."
-    },
-    "create-package": {
-      "factory": "./src/generators/create-package/create-package#createPackageSchematic",
-      "schema": "./src/generators/create-package/schema.json",
-      "description": "Create a package which can be used by npx to create a new workspace"
-    },
-    "e2e-project": {
-      "factory": "./src/generators/e2e-project/e2e#e2eProjectSchematic",
-      "schema": "./src/generators/e2e-project/schema.json",
-      "description": "Create a E2E application for a Nx Plugin."
-    },
-    "migration": {
-      "factory": "./src/generators/migration/migration#migrationSchematic",
-      "schema": "./src/generators/migration/schema.json",
-      "description": "Create a migration for an Nx Plugin."
-    },
-    "generator": {
-      "factory": "./src/generators/generator/generator#generatorSchematic",
-      "schema": "./src/generators/generator/schema.json",
-      "description": "Create a generator for an Nx Plugin."
-    },
-    "executor": {
-      "factory": "./src/generators/executor/executor#executorSchematic",
-      "schema": "./src/generators/executor/schema.json",
-      "description": "Create an executor for an Nx Plugin."
-    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "17.0.0-beta.1",
+  "version": "17.0.0-beta.4",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -21,8 +21,8 @@
     "url": "https://github.com/nrwl/nx/issues"
   },
   "homepage": "https://nx.dev",
-  "schematics": "./generators.json",
-  "builders": "./executors.json",
+  "generators": "./generators.json",
+  "executors": "./executors.json",
   "ng-update": {
     "requirements": {},
     "migrations": "./migrations.json"
@@ -31,11 +31,11 @@
     "@phenomnomnominal/tsquery": "~5.0.1",
     "fs-extra": "^11.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.0.0-beta.1",
-    "@nx/jest": "17.0.0-beta.1",
-    "@nx/js": "17.0.0-beta.1",
-    "@nx/linter": "17.0.0-beta.1",
-    "@nrwl/nx-plugin": "17.0.0-beta.1"
+    "@nx/devkit": "17.0.0-beta.4",
+    "@nx/jest": "17.0.0-beta.4",
+    "@nx/js": "17.0.0-beta.4",
+    "@nx/linter": "17.0.0-beta.4",
+    "@nrwl/nx-plugin": "17.0.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/create-package/create-package.d.ts

@@ -1,6 +1,5 @@
-import { Tree, GeneratorCallback } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { CreatePackageSchema } from './schema';
 export declare function createPackageGenerator(host: Tree, schema: CreatePackageSchema): Promise<GeneratorCallback>;
 export declare function createPackageGeneratorInternal(host: Tree, schema: CreatePackageSchema): Promise<GeneratorCallback>;
 export default createPackageGenerator;
-export declare const createPackageSchematic: (generatorOptions: CreatePackageSchema) => (tree: any, context: any) => Promise<any>;

package/src/generators/create-package/create-package.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPackageSchematic = exports.createPackageGeneratorInternal = exports.createPackageGenerator = void 0;
+exports.createPackageGeneratorInternal = exports.createPackageGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const versions_1 = require("nx/src/utils/versions");
@@ -77,8 +77,6 @@ async function createCliPackage(host, options, pluginPackageName) {
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     projectConfiguration.sourceRoot = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin');
     projectConfiguration.targets.build.options.main = (0, devkit_1.joinPathFragments)(options.projectRoot, 'bin/index.ts');
-    projectConfiguration.targets.build.options.updateBuildableProjectDepsInPackageJson =
-        false;
     projectConfiguration.implicitDependencies = [options.project];
     (0, devkit_1.updateProjectConfiguration)(host, options.projectName, projectConfiguration);
     // Add bin files to tsconfg.lib.json
@@ -111,4 +109,3 @@ function addE2eProject(host, options) {
     });
 }
 exports.default = createPackageGenerator;
-exports.createPackageSchematic = (0, devkit_1.convertNxGenerator)(createPackageGenerator);

package/src/generators/e2e-project/e2e.d.ts

@@ -4,4 +4,3 @@ import type { Schema } from './schema';
 export declare function e2eProjectGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function e2eProjectGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default e2eProjectGenerator;
-export declare const e2eProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/e2e-project/e2e.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.e2eProjectSchematic = exports.e2eProjectGeneratorInternal = exports.e2eProjectGenerator = void 0;
+exports.e2eProjectGeneratorInternal = exports.e2eProjectGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const jest_1 = require("@nx/jest");
@@ -138,4 +138,3 @@ async function e2eProjectGeneratorInternal(host, schema) {
 }
 exports.e2eProjectGeneratorInternal = e2eProjectGeneratorInternal;
 exports.default = e2eProjectGenerator;
-exports.e2eProjectSchematic = (0, devkit_1.convertNxGenerator)(e2eProjectGenerator);

package/src/generators/executor/executor.d.ts

@@ -3,4 +3,3 @@ import type { Schema } from './schema';
 export declare function createExecutorsJson(host: Tree, projectRoot: string, projectName: string, skipLintChecks?: boolean): Promise<void>;
 export declare function executorGenerator(host: Tree, schema: Schema): Promise<void>;
 export default executorGenerator;
-export declare const executorSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/executor/executor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executorSchematic = exports.executorGenerator = exports.createExecutorsJson = void 0;
+exports.executorGenerator = exports.createExecutorsJson = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
@@ -108,4 +108,3 @@ async function executorGenerator(host, schema) {
 }
 exports.executorGenerator = executorGenerator;
 exports.default = executorGenerator;
-exports.executorSchematic = (0, devkit_1.convertNxGenerator)(executorGenerator);

package/src/generators/executor/files/hasher/__fileName__/hasher.spec.ts__tmpl__

@@ -13,7 +13,8 @@ describe('<%=propertyName%>Hasher', () => {
                 project: 'proj',
                 target: 'target'
             },
-            overrides: {}
+            overrides: {},
+            outputs: []
         }, {
             hasher: mockHasher
         } as unknown as HasherContext)

package/src/generators/generator/generator.d.ts

@@ -3,4 +3,3 @@ import type { Schema } from './schema';
 export declare function createGeneratorsJson(host: Tree, projectRoot: string, projectName: string, skipLintChecks?: boolean, skipFormat?: boolean): Promise<void>;
 export declare function generatorGenerator(host: Tree, schema: Schema): Promise<void>;
 export default generatorGenerator;
-export declare const generatorSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/generator/generator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatorSchematic = exports.generatorGenerator = exports.createGeneratorsJson = void 0;
+exports.generatorGenerator = exports.createGeneratorsJson = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const has_generator_1 = require("../../utils/has-generator");
@@ -106,4 +106,3 @@ async function generatorGenerator(host, schema) {
 }
 exports.generatorGenerator = generatorGenerator;
 exports.default = generatorGenerator;
-exports.generatorSchematic = (0, devkit_1.convertNxGenerator)(generatorGenerator);

package/src/generators/migration/migration.d.ts

@@ -2,4 +2,3 @@ import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function migrationGenerator(host: Tree, schema: Schema): Promise<void>;
 export default migrationGenerator;
-export declare const migrationSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/migration/migration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrationSchematic = exports.migrationGenerator = void 0;
+exports.migrationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
 const generator_1 = require("../lint-checks/generator");
@@ -109,4 +109,3 @@ async function migrationGenerator(host, schema) {
 }
 exports.migrationGenerator = migrationGenerator;
 exports.default = migrationGenerator;
-exports.migrationSchematic = (0, devkit_1.convertNxGenerator)(migrationGenerator);

package/src/generators/plugin/plugin.d.ts

@@ -3,4 +3,3 @@ import type { Schema } from './schema';
 export declare function pluginGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function pluginGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default pluginGenerator;
-export declare const pluginSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/plugin/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pluginSchematic = exports.pluginGeneratorInternal = exports.pluginGenerator = void 0;
+exports.pluginGeneratorInternal = exports.pluginGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
@@ -105,4 +105,3 @@ async function pluginGeneratorInternal(host, schema) {
 }
 exports.pluginGeneratorInternal = pluginGeneratorInternal;
 exports.default = pluginGenerator;
-exports.pluginSchematic = (0, devkit_1.convertNxGenerator)(pluginGenerator);

package/src/executors/e2e/compat.d.ts

@@ -1 +0,0 @@
-export declare const nxPluginE2EBuilder: any;

package/src/executors/e2e/compat.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nxPluginE2EBuilder = void 0;
-const devkit_1 = require("@nx/devkit");
-const e2e_impl_1 = require("./e2e.impl");
-exports.nxPluginE2EBuilder = (0, devkit_1.convertNxExecutor)(e2e_impl_1.nxPluginE2EExecutor);