@nx/plugin 20.0.0-canary.20241002-1d10a19 → 20.0.0-rc.0

package/migrations.json

@@ -1,22 +1,3 @@
 {
-  "generators": {
-    "update-remove-cli-prop": {
-      "version": "16.0.0-beta.1",
-      "cli": "nx",
-      "description": "Removes CLI property within schema.json files and moves generators and schematics to the proper root node in migrations.json",
-      "factory": "./src/migrations/update-16-0-0/cli-in-schema-json"
-    },
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "version": "16.0.0-beta.1",
-      "description": "Replace @nrwl/nx-plugin with @nx/plugin",
-      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
-    },
-    "update-16-2-0-replace-e2e-executor": {
-      "cli": "nx",
-      "version": "16.2.0-beta.0",
-      "description": "Replace @nx/plugin:e2e with @nx/jest",
-      "implementation": "./src/migrations/update-16-2-0/replace-e2e-executor"
-    }
-  }
+  "generators": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "20.0.0-canary.20241002-1d10a19",
+  "version": "20.0.0-rc.0",
   "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": {
@@ -28,10 +28,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.0.0-canary.20241002-1d10a19",
-    "@nx/jest": "20.0.0-canary.20241002-1d10a19",
-    "@nx/js": "20.0.0-canary.20241002-1d10a19",
-    "@nx/eslint": "20.0.0-canary.20241002-1d10a19"
+    "@nx/devkit": "20.0.0-rc.0",
+    "@nx/jest": "20.0.0-rc.0",
+    "@nx/js": "20.0.0-rc.0",
+    "@nx/eslint": "20.0.0-rc.0"
   },
   "publishConfig": {
     "access": "public"

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

@@ -4,6 +4,7 @@ exports.createPackageGenerator = createPackageGenerator;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("nx/src/utils/versions");
 const generator_1 = require("../generator/generator");
 const normalize_schema_1 = require("./utils/normalize-schema");
@@ -11,6 +12,7 @@ const has_generator_1 = require("../../utils/has-generator");
 const path_1 = require("path");
 const versions_2 = require("@nx/js/src/utils/versions");
 async function createPackageGenerator(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'plugin', 'create-package');
     const tasks = [];
     const options = await (0, normalize_schema_1.normalizeSchema)(host, schema);
     const pluginPackageName = await addPresetGenerator(host, options);

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

@@ -8,6 +8,7 @@ const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
 const generator_1 = require("@nx/js/src/generators/setup-verdaccio/generator");
 const add_local_registry_scripts_1 = require("@nx/js/src/utils/add-local-registry-scripts");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const eslint_1 = require("@nx/eslint");
 const path_1 = require("path");
 async function normalizeOptions(host, options) {
@@ -107,6 +108,7 @@ async function e2eProjectGenerator(host, schema) {
     });
 }
 async function e2eProjectGeneratorInternal(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'plugin', 'e2e-project');
     const tasks = [];
     validatePlugin(host, schema.pluginName);
     const options = await normalizeOptions(host, schema);

package/src/generators/executor/files/executor/executor.spec.ts.template

@@ -8,6 +8,15 @@ const context: ExecutorContext = {
   root: '',
   cwd: process.cwd(),
   isVerbose: false,
+  projectGraph: {
+    nodes: {},
+    dependencies: {},
+  },
+  projectsConfigurations: {
+    projects: {},
+    version: 2,
+  },
+  nxJsonConfiguration: {},
 };
 
 describe('<%= className %> Executor', () => {
@@ -15,4 +24,4 @@ describe('<%= className %> Executor', () => {
     const output = await executor(options, context);
     expect(output.success).toBe(true);
   });
-});
+});

package/src/generators/plugin/plugin.js

@@ -4,6 +4,7 @@ exports.pluginGenerator = pluginGenerator;
 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");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const eslint_1 = require("@nx/eslint");
 const path = require("path");
 const e2e_1 = require("../e2e-project/e2e");
@@ -51,6 +52,7 @@ function updatePluginConfig(host, options) {
     }
 }
 async function pluginGenerator(host, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'plugin', 'plugin');
     const options = await (0, normalize_schema_1.normalizeOptions)(host, schema);
     const tasks = [];
     tasks.push(await (0, js_1.libraryGenerator)(host, {

package/src/generators/preset/generator.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../plugin/plugin");
 const create_package_1 = require("../create-package/create-package");
 async function default_1(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'plugin', 'preset');
     const tasks = [];
     const pluginProjectName = (0, devkit_1.names)(options.pluginName.includes('/')
         ? options.pluginName.split('/')[1]

package/src/migrations/update-16-0-0/cli-in-schema-json.d.ts

@@ -1,3 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function updateCliPropsForPlugins(tree: Tree): void;
-export default updateCliPropsForPlugins;

package/src/migrations/update-16-0-0/cli-in-schema-json.js

@@ -1,134 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateCliPropsForPlugins = updateCliPropsForPlugins;
-const devkit_1 = require("@nx/devkit");
-const package_json_1 = require("nx/src/utils/package-json");
-const path_1 = require("path");
-function updateCliPropsForPlugins(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const project of projects.values()) {
-        if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'package.json'))) {
-            const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
-            const migrateConfig = (0, package_json_1.readNxMigrateConfig)(packageJson);
-            if (migrateConfig.migrations) {
-                const migrationsPath = (0, devkit_1.joinPathFragments)(project.root, migrateConfig.migrations);
-                if (tree.exists(migrationsPath)) {
-                    updateMigrationsJsonForPlugin(tree, migrationsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Migrations file specified for ${packageJson.name} does not exist: ${migrationsPath}`,
-                        bodyLines: [
-                            'Please ensure that migrations that use the Angular Devkit are placed inside the `schematics` property, and migrations that use the Nx Devkit are placed inside the `generators` property.',
-                        ],
-                    });
-                }
-            }
-            if (packageJson.generators) {
-                const generatorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.generators);
-                if (tree.exists(generatorsPath)) {
-                    removeCliFromGeneratorSchemaJsonFiles(tree, generatorsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Generators file specified for ${packageJson.name} does not exist: ${generatorsPath}`,
-                        bodyLines: [
-                            "The `cli` property inside generator's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-            if (packageJson.executors) {
-                const executorsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.executors);
-                if (tree.exists(executorsPath)) {
-                    removeCliFromExecutorSchemaJsonFiles(tree, executorsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Executors file specified for ${packageJson.name} does not exist: ${executorsPath}`,
-                        bodyLines: [
-                            "The `cli` property inside executor's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-            if (packageJson.builders) {
-                const buildersPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.builders);
-                if (tree.exists(buildersPath)) {
-                    removeCliFromExecutorSchemaJsonFiles(tree, buildersPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Builders file specified for ${packageJson.name} does not exist: ${buildersPath}`,
-                        bodyLines: [
-                            "The `cli` property inside builder's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-            if (packageJson.schematics) {
-                const schematicsPath = (0, devkit_1.joinPathFragments)(project.root, packageJson.schematics);
-                if (tree.exists(schematicsPath)) {
-                    removeCliFromGeneratorSchemaJsonFiles(tree, schematicsPath);
-                }
-                else {
-                    devkit_1.output.warn({
-                        title: `Schematics file specified for ${packageJson.name} does not exist: ${schematicsPath}`,
-                        bodyLines: [
-                            "The `cli` property inside schematic's `schema.json` files is no longer supported.",
-                        ],
-                    });
-                }
-            }
-        }
-    }
-}
-function removeCliFromExecutorSchemaJsonFiles(tree, collectionPath) {
-    const collection = (0, devkit_1.readJson)(tree, collectionPath);
-    for (const [name, entry] of Object.entries(collection.executors ?? {}).concat(Object.entries(collection.builders ?? {}))) {
-        deleteCliPropFromSchemaFile(collectionPath, entry, tree);
-    }
-}
-function removeCliFromGeneratorSchemaJsonFiles(tree, collectionPath) {
-    const collection = (0, devkit_1.readJson)(tree, collectionPath);
-    for (const [name, entry] of Object.entries(collection.generators ?? {}).concat(Object.entries(collection.schematics ?? {}))) {
-        deleteCliPropFromSchemaFile(collectionPath, entry, tree);
-    }
-}
-function updateMigrationsJsonForPlugin(tree, collectionPath) {
-    (0, devkit_1.updateJson)(tree, collectionPath, (json) => {
-        for (const migration in json.generators ?? {}) {
-            if (!(json.generators[migration].cli === 'nx')) {
-                json.schematics ??= {};
-                json.schematics[migration] = json.generators[migration];
-                delete json.generators[migration];
-            }
-        }
-        for (const migration in json.schematics ?? {}) {
-            if (json.schematics[migration].cli === 'nx') {
-                json.generators ??= {};
-                json.generators[migration] = json.schematics[migration];
-                delete json.schematics[migration];
-            }
-        }
-        return json;
-    });
-}
-exports.default = updateCliPropsForPlugins;
-function deleteCliPropFromSchemaFile(collectionPath, entry, tree) {
-    if (typeof entry === 'string' || !entry.schema) {
-        return;
-    }
-    const schemaPath = (0, devkit_1.joinPathFragments)((0, path_1.dirname)(collectionPath), entry.schema);
-    if (tree.exists(schemaPath)) {
-        (0, devkit_1.updateJson)(tree, schemaPath, (json) => {
-            if (json.cli) {
-                delete json.cli;
-            }
-            return json;
-        });
-    }
-    else {
-        console.warn(`Could not find schema file ${schemaPath}`);
-    }
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/nx-plugin', '@nx/plugin');
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-16-2-0/replace-e2e-executor.d.ts

@@ -1,7 +0,0 @@
-import { Tree } from '@nx/devkit';
-import { JestExecutorOptions } from '@nx/jest/src/executors/jest/schema';
-export interface NxPluginE2EExecutorOptions extends JestExecutorOptions {
-    target: string;
-    jestConfig: string;
-}
-export default function replaceE2EExecutor(tree: Tree): Promise<void>;

package/src/migrations/update-16-2-0/replace-e2e-executor.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replaceE2EExecutor;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-async function replaceE2EExecutor(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const executor of ['@nx/plugin:e2e', '@nrwl/nx-plugin:e2e']) {
-        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (options, project, target, configuration) => {
-            const projectConfiguration = projects.get(project);
-            const config = {
-                ...options,
-                target: undefined,
-                runInBand: true,
-            };
-            if (configuration) {
-                projectConfiguration.targets[target].configurations[configuration] =
-                    config;
-            }
-            else {
-                projectConfiguration.targets[target].dependsOn = [
-                    ...(projectConfiguration.targets[target].dependsOn ?? []),
-                    options.target,
-                ];
-                projectConfiguration.targets[target].executor = '@nx/jest:jest';
-                projectConfiguration.targets[target].options = config;
-            }
-            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
-        });
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}