@nx/plugin 21.2.3 → 21.3.0-beta.1

package/package.json

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

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

@@ -131,7 +131,7 @@ function addE2eProject(host, options) {
     const e2eProjectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.e2eProject);
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.project);
     const { name: pluginPackageName } = (0, devkit_1.readJson)(host, (0, path_1.join)(projectConfiguration.root, 'package.json'));
-    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/e2e'), (0, ts_solution_setup_1.getProjectSourceRoot)(e2eProjectConfiguration, host), {
+    (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/e2e'), e2eProjectConfiguration.sourceRoot, {
         pluginName: options.project,
         cliName: options.name,
         packageManagerCommands: (0, devkit_1.getPackageManagerCommand)(),

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

@@ -97,18 +97,16 @@ async function addJest(host, options) {
     (0, jest_1.addPropertyToJestConfig)(host, (0, path_1.join)(options.projectRoot, 'jest.config.ts'), 'globalTeardown', (0, path_1.join)((0, devkit_1.offsetFromRoot)(options.projectRoot), stopLocalRegistryPath));
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     project.targets ??= {};
-    if (project.targets.e2e) {
-        const e2eTarget = project.targets.e2e;
-        project.targets.e2e = {
-            ...e2eTarget,
-            dependsOn: [`^build`],
-            options: {
-                ...e2eTarget.options,
-                runInBand: true,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
-    }
+    const e2eTarget = project.targets.e2e;
+    project.targets.e2e = {
+        ...e2eTarget,
+        dependsOn: [`^build`],
+        options: {
+            ...e2eTarget.options,
+            runInBand: true,
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.projectName, project);
     return jestTask;
 }
 async function addLintingToApplication(tree, options) {

package/src/generators/plugin/plugin.js

@@ -6,7 +6,6 @@ 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 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 path = require("path");
 const e2e_1 = require("../e2e-project/e2e");
 const generator_1 = require("../lint-checks/generator");
@@ -23,7 +22,8 @@ function updatePluginConfig(host, options) {
     const project = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     if (project.targets.build) {
         if (options.isTsSolutionSetup && options.bundler === 'tsc') {
-            project.targets.build.options.rootDir = (0, ts_solution_setup_1.getProjectSourceRoot)(project, host);
+            project.targets.build.options.rootDir =
+                project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src');
             project.targets.build.options.generatePackageJson = false;
         }
         project.targets.build.options.assets = [

package/src/utils/paths.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getArtifactMetadataDirectory = getArtifactMetadataDirectory;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const posix_1 = require("node:path/posix");
 function getArtifactMetadataDirectory(tree, projectName, sourceDirectory, isTsSolutionSetup) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, projectName);
@@ -24,6 +23,9 @@ function getArtifactMetadataDirectory(tree, projectName, sourceDirectory, isTsSo
     // unless the user manually changed the build process. In that case, we can't
     // reliably determine the output directory because it depends on the build
     // tool, so we'll just assume some defaults.
-    const baseDir = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const baseDir = project.sourceRoot ??
+        (tree.exists((0, posix_1.join)(project.root, 'src'))
+            ? (0, posix_1.join)(project.root, 'src')
+            : project.root);
     return `./${(0, posix_1.join)('dist', (0, posix_1.relative)(baseDir, sourceDirectory))}`;
 }