@nx/plugin 20.3.1 → 20.3.3

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "20.3.1",
+  "version": "20.3.3",
   "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.3.1",
-    "@nx/jest": "20.3.1",
-    "@nx/js": "20.3.1",
-    "@nx/eslint": "20.3.1"
+    "@nx/devkit": "20.3.3",
+    "@nx/jest": "20.3.3",
+    "@nx/js": "20.3.3",
+    "@nx/eslint": "20.3.3"
   },
   "publishConfig": {
     "access": "public"

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

@@ -4,7 +4,6 @@ exports.createPackageGenerator = createPackageGenerator;
 exports.createPackageGeneratorInternal = createPackageGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
 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/js/src/utils/versions");
@@ -31,19 +30,14 @@ async function createPackageGeneratorInternal(host, schema) {
         'create-nx-workspace': versions_2.nxVersion,
     }, {});
     tasks.push(installTask);
-    await createCliPackage(host, options, pluginPackageName);
+    const cliPackageTask = await createCliPackage(host, options, pluginPackageName);
+    tasks.push(cliPackageTask);
     if (options.e2eProject) {
         addE2eProject(host, options);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    if (options.isTsSolutionSetup) {
-        const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(host, options.projectRoot);
-        if (projectPackageManagerWorkspaceState !== 'included') {
-            tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, host.root));
-        }
-    }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 /**
@@ -66,7 +60,7 @@ async function addPresetGenerator(host, schema) {
     return (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(projectRoot, 'package.json'))?.name;
 }
 async function createCliPackage(host, options, pluginPackageName) {
-    await (0, js_1.libraryGenerator)(host, {
+    const jsLibraryTask = await (0, js_1.libraryGenerator)(host, {
         ...options,
         directory: options.directory,
         rootProject: false,
@@ -77,7 +71,6 @@ async function createCliPackage(host, options, pluginPackageName) {
         skipFormat: true,
         skipTsConfig: true,
         useTscExecutor: true,
-        skipWorkspacesWarning: true,
     });
     host.delete((0, devkit_1.joinPathFragments)(options.projectRoot, 'src'));
     const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
@@ -126,6 +119,7 @@ async function createCliPackage(host, options, pluginPackageName) {
         preset: pluginPackageName,
         tmpl: '',
     });
+    return jsLibraryTask;
 }
 /**
  * Add a test file to plugin e2e project

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

@@ -10,7 +10,6 @@ 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 generator_prompts_1 = require("@nx/js/src/utils/generator-prompts");
-const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 async function normalizeOptions(host, options) {
@@ -163,15 +162,14 @@ async function e2eProjectGeneratorInternal(host, schema) {
             return json;
         });
     }
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isTsSolutionSetup) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    if (options.isTsSolutionSetup && !options.skipWorkspacesWarning) {
-        const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(host, options.projectRoot);
-        if (projectPackageManagerWorkspaceState !== 'included') {
-            tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, host.root));
-        }
-    }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = e2eProjectGenerator;

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

@@ -11,5 +11,4 @@ export interface Schema {
   rootProject?: boolean;
   useProjectJson?: boolean;
   addPlugin?: boolean;
-  skipWorkspacesWarning?: boolean;
 }

package/src/generators/plugin/plugin.js

@@ -5,7 +5,6 @@ exports.pluginGeneratorInternal = pluginGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
-const package_manager_workspaces_1 = require("@nx/js/src/utils/package-manager-workspaces");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
 const add_tslib_dependencies_1 = require("@nx/js/src/utils/typescript/add-tslib-dependencies");
 const path = require("path");
@@ -63,9 +62,14 @@ async function pluginGeneratorInternal(host, schema) {
         useProjectJson: options.useProjectJson,
         addPlugin: options.addPlugin,
         skipFormat: true,
-        skipWorkspacesWarning: true,
         useTscExecutor: true,
     }));
+    if (options.isTsSolutionSetup) {
+        (0, devkit_1.updateJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), (json) => {
+            delete json.type;
+            return json;
+        });
+    }
     if (options.bundler === 'tsc') {
         tasks.push((0, add_tslib_dependencies_1.addTsLibDependencies)(host));
     }
@@ -93,7 +97,6 @@ async function pluginGeneratorInternal(host, schema) {
             linter: options.linter,
             useProjectJson: options.useProjectJson,
             addPlugin: options.addPlugin,
-            skipWorkspacesWarning: true,
         }));
     }
     if (options.linter === eslint_1.Linter.EsLint && !options.skipLintChecks) {
@@ -102,12 +105,6 @@ async function pluginGeneratorInternal(host, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    if (options.isTsSolutionSetup) {
-        const projectPackageManagerWorkspaceState = (0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceState)(host, options.projectRoot);
-        if (projectPackageManagerWorkspaceState !== 'included') {
-            tasks.push((0, package_manager_workspaces_1.getProjectPackageManagerWorkspaceStateWarningTask)(projectPackageManagerWorkspaceState, host.root));
-        }
-    }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.default = pluginGenerator;